mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake: remove vendor-specific options

Browse Source
This commit is contained in:
Marc-André Moreau 2013-09-10 14:03:15 -04:00
parent 8191f4b7b6
commit 4a4a36d5c4
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -162,6 +162,10 @@ if(CMAKE_COMPILER_IS_CLANG)
if(WITH_SSE2) if(WITH_SSE2)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mssse3") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mssse3")
endif() endif()
CHECK_C_COMPILER_FLAG(-Wno-deprecated-declarations Wno-deprecated-declarations)
if(Wno-deprecated-declarations)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations")
endif()
endif() endif()
if(MSVC) if(MSVC)

4
winpr/CMakeLists.txt
View File

@ -72,9 +72,7 @@ endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/winpr/config.h.in configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/winpr/config.h.in
${CMAKE_CURRENT_BINARY_DIR}/include/winpr/config.h) ${CMAKE_CURRENT_BINARY_DIR}/include/winpr/config.h)
if(NOT WITH_WAYK) add_subdirectory(include)
add_subdirectory(include)
endif()
add_subdirectory(libwinpr) add_subdirectory(libwinpr)

2
winpr/libwinpr/CMakeLists.txt
View File

@ -55,9 +55,7 @@ if(MONOLITHIC_BUILD)
target_link_libraries(${MODULE_NAME} ${WINPR_LIBS}) target_link_libraries(${MODULE_NAME} ${WINPR_LIBS})
if(NOT WITH_WAYK)
install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries) install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
endif()
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/libwinpr") set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/libwinpr")
endif() endif()

7
winpr/tools/makecert/CMakeLists.txt
View File

@ -38,10 +38,9 @@ set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
if(NOT WITH_WAYK) install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
add_subdirectory(cli) add_subdirectory(cli)
endif()
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools") set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools")