From 97ca2423a4686f7f9e85a33a88556dae4aad1bab Mon Sep 17 00:00:00 2001 From: Maximilien Siavelis <m@siav.pw> Date: 周一, 06 5月 2019 21:47:20 +0800 Subject: [PATCH] Merge pull request #21 from matteovaralta91/master --- CMakeLists.txt | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cc755ac..36c3611 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,6 @@ endif(CMAKE_BUILD_TYPE) if(MSVC) - SET(PLATFORM_LIBS "") include(target_arch) target_architecture( TARGET_ARCHITECTURE ) @@ -68,6 +67,7 @@ SET(HAVE_64BIT_SIZE_T 0) endif(CMAKE_SIZEOF_VOID_P EQUAL 8) +set( Boost_USE_STATIC_LIBS ON ) find_package(Boost 1.55.0 COMPONENTS date_time unit_test_framework program_options system filesystem) #set below in case of dynamic linking in debug. #set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:Debug>:BOOST_TEST_DYN_LINK>) @@ -98,6 +98,7 @@ list(APPEND EXTERNAL_LIBS ${DBUS_LIBRARIES}) endif(USE_DBUS_IDENTIFIER) list(APPEND EXTERNAL_LIBS dl) + list(APPEND EXTERNAL_LIBS "-Wl,-Bdynamic") endif(NOT MSVC) configure_file ( @@ -125,8 +126,3 @@ message( STATUS "Build type: " ${CMAKE_BUILD_TYPE}) endif(CMAKE_BUILD_TYPE) message( STATUS "Install prefix: " ${CMAKE_INSTALL_PREFIX}) -if(DOXYGEN_FOUND) - message(STATUS "Doxygen: " ${DOXYGEN_EXECUTABLE}) -else(DOXYGEN_FOUND) - message(STATUS "Doxygen: not found.") -endif(DOXYGEN_FOUND) -- Gitblit v1.9.1