From 628eb7f5c854e441a95ef4cc546f8ba5573fc26a Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 12 Oct 2016 14:45:02 +0200 Subject: [PATCH] fix static compilation --- console/CMakeLists.txt | 3 +++ daemon/CMakeLists.txt | 2 ++ gtk/CMakeLists.txt | 1 + tester/CMakeLists.txt | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt index 206ed985a..d4dc9d259 100644 --- a/console/CMakeLists.txt +++ b/console/CMakeLists.txt @@ -38,6 +38,8 @@ endif() add_executable(linphonec ${LINPHONEC_SOURCE_FILES}) target_link_libraries(linphonec ${LINPHONE_LIBS_FOR_TOOLS} ${BCTOOLBOX_CORE_LIBRARIES} ${ORTP_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES}) +set_target_properties(linphonec PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}") + if(INTL_FOUND) target_link_libraries(linphonec ${INTL_LIBRARIES}) endif() @@ -52,6 +54,7 @@ endif() add_executable(linphonecsh ${LINPHONECSH_SOURCE_FILES}) target_link_libraries(linphonecsh ${LINPHONE_LIBS_FOR_TOOLS} ${ORTP_LIBRARIES}) +set_target_properties(linphonecsh PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}") set(INSTALL_TARGETS linphonec linphonecsh) if(WIN32) diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt index 2140af358..2137c230f 100644 --- a/daemon/CMakeLists.txt +++ b/daemon/CMakeLists.txt @@ -115,9 +115,11 @@ apply_compile_flags(DAEMON_PIPETEST_SOURCE_FILES "CPP" "C") add_executable(linphone-daemon ${DAEMON_SOURCE_FILES}) target_include_directories(linphone-daemon PRIVATE ${CMAKE_CURRENT_LIST_DIR}) target_link_libraries(linphone-daemon ${LINPHONE_LIBS_FOR_TOOLS} ${MEDIASTREAMER2_LIBRARIES}) +set_target_properties(linphone-daemon PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}") add_executable(linphone-daemon-pipetest ${DAEMON_PIPETEST_SOURCE_FILES}) target_link_libraries(linphone-daemon-pipetest ${LINPHONE_LIBS_FOR_TOOLS} ${ORTP_LIBRARIES}) +set_target_properties(linphone-daemon-pipetest PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}") set(INSTALL_TARGETS linphone-daemon linphone-daemon-pipetest) diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt index 3e36665b5..ae3e0d2d0 100644 --- a/gtk/CMakeLists.txt +++ b/gtk/CMakeLists.txt @@ -95,6 +95,7 @@ endif() set_target_properties(linphone-gtk PROPERTIES OUTPUT_NAME linphone LINKER_LANGUAGE CXX) target_include_directories(linphone-gtk PUBLIC ${GTK2_INCLUDE_DIRS} ${INTL_INCLUDE_DIRS}) target_link_libraries(linphone-gtk ${LINPHONE_LIBS_FOR_TOOLS} ${GTK2_LIBRARIES} ${BCTOOLBOX_CORE_LIBRARIES} ${ORTP_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES}) +set_target_properties(linphone-gtk PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}") if(INTL_FOUND) target_link_libraries(linphone-gtk ${INTL_LIBRARIES}) endif() diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt index 1eb8f21cf..4e134789b 100644 --- a/tester/CMakeLists.txt +++ b/tester/CMakeLists.txt @@ -267,10 +267,10 @@ if (NOT ANDROID AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") if(IOS) set_source_files_properties(${IOS_RESOURCES_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) add_executable(liblinphone_tester MACOSX_BUNDLE ${IOS_RESOURCES_FILES} ${SOURCE_FILES_C} ${SOURCE_FILES_OBJC}) - set_target_properties(liblinphone_tester PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}") else() add_executable(liblinphone_tester ${SOURCE_FILES_C} ${SOURCE_FILES_OBJC}) endif() + set_target_properties(liblinphone_tester PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}") set_target_properties(liblinphone_tester PROPERTIES LINKER_LANGUAGE CXX) target_include_directories(liblinphone_tester PUBLIC ${BCTOOLBOX_TESTER_INCLUDE_DIRS}) target_link_libraries(liblinphone_tester ${LINPHONE_LIBS_FOR_TOOLS} ${OTHER_LIBS_FOR_TESTER})