From 8e1921592df1abd7a6a00504410d776822c2b46f Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 24 Jun 2016 15:40:57 +0200 Subject: [PATCH] CMake fixes for static library build. --- CMakeLists.txt | 10 +++++----- cmake/{BelrConfig.cmake => BelrConfig.cmake.in} | 8 +++++++- tools/CMakeLists.txt | 8 +++++++- 3 files changed, 19 insertions(+), 7 deletions(-) rename cmake/{BelrConfig.cmake => BelrConfig.cmake.in} (94%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d0aca9..220032f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,9 +129,9 @@ include(CMakePackageConfigHelpers) export(EXPORT ${EXPORT_TARGETS_NAME}Targets FILE "${CMAKE_CURRENT_BINARY_DIR}/BelrTargets.cmake" ) -configure_file(cmake/BelrConfig.cmake - "${CMAKE_CURRENT_BINARY_DIR}/BelrConfig.cmake" - COPYONLY +configure_file(cmake/BelrConfig.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/BelrConfig.cmake" + @ONLY ) set(ConfigPackageLocation share/Belr/cmake) install(EXPORT ${EXPORT_TARGETS_NAME}Targets @@ -139,6 +139,6 @@ install(EXPORT ${EXPORT_TARGETS_NAME}Targets DESTINATION ${ConfigPackageLocation} ) install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/BelrConfig.cmake" - DESTINATION ${ConfigPackageLocation} + "${CMAKE_CURRENT_BINARY_DIR}/BelrConfig.cmake" + DESTINATION ${ConfigPackageLocation} ) diff --git a/cmake/BelrConfig.cmake b/cmake/BelrConfig.cmake.in similarity index 94% rename from cmake/BelrConfig.cmake rename to cmake/BelrConfig.cmake.in index 157aff4..1c10baa 100644 --- a/cmake/BelrConfig.cmake +++ b/cmake/BelrConfig.cmake.in @@ -37,5 +37,11 @@ if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS) else() set(BELR_INCLUDE_DIRS "${BELR_CMAKE_DIR}/../../../include") endif() -set(BELR_LIBRARIES belr) + +if(@ENABLE_SHARED@) + set(BELR_LIBRARIES belr) +else() + set(BELR_LIBRARIES belr-static) +endif() + set(BELR_FOUND 1) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 74c2867..17bceda 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -20,12 +20,18 @@ # ############################################################################ +if(ENABLE_SHARED) + set(BELR_LIBRARIES_FOR_TOOLS belr) +else() + set(BELR_LIBRARIES_FOR_TOOLS belr-static) +endif() + foreach(EXECTUABLE belr-parse belr-demo) set(SOURCE_FILES_CXX ${EXECTUABLE}.cc) apply_compile_flags(SOURCE_FILES_CXX "CPP" "CXX") add_executable(${EXECTUABLE} ${SOURCE_FILES_CXX}) set_target_properties(${EXECTUABLE} PROPERTIES LINKER_LANGUAGE CXX) - target_link_libraries(${EXECTUABLE} belr) + target_link_libraries(${EXECTUABLE} ${BELR_LIBRARIES_FOR_TOOLS}) if(APPLE) set_target_properties(${EXECTUABLE} PROPERTIES LINK_FLAGS "-stdlib=libc++") endif() -- 2.21.0