[Pkg-running-devel] [antpm] 27/41: cmake: improve boost dynamic linking for travis

[Kristof Ralovich]

This is an automated email from the git hooks/post-receive script.

ralovich-guest pushed a commit to branch upstream
in repository antpm.

commit 9631cc3b57aa15d1683e86a0b21911a6781dd787
Author: RALOVICH, Kristof <tade60 at freemail.hu>
Date:   Sat Oct 10 18:06:12 2015 +0200

    cmake: improve boost dynamic linking for travis
---
 src/CMakeLists.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 39886ee..ae66cc0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -64,11 +64,14 @@ ENDIF()
 
 IF(USE_BOOST_STATIC_LINK)
   set(Boost_USE_STATIC_LIBS        ON)
+  set(Boost_USE_STATIC_RUNTIME    ON)
 ELSE()
   set(Boost_USE_STATIC_LIBS        OFF)
+  set(Boost_USE_STATIC_RUNTIME    OFF)
+  ADD_DEFINITIONS(-DBOOST_TEST_MAIN)
+  ADD_DEFINITIONS(-DBOOST_TEST_DYN_LINK)
 ENDIF()
 set(Boost_USE_MULTITHREADED      ON)
-set(Boost_USE_STATIC_RUNTIME    OFF)
 FIND_PACKAGE(Boost 1.41.0 COMPONENTS thread unit_test_framework program_options system filesystem date_time atomic exception REQUIRED)
 IF(NOT Boost_FOUND)
   MESSAGE(FATAL_ERROR "Boost not found!")
@@ -123,7 +126,7 @@ IF(NOT WIN32)
   SET(MY_ANTPM_LIBRARIES "stdc++;rt")
 ENDIF()
 
-MESSAGE(STATUS "Boost_LIBRARIES="${Boost_LIBRARIES})
+
 ADD_LIBRARY(antpm
   ${SRCS}
 )
@@ -136,7 +139,6 @@ TARGET_LINK_LIBRARIES(antpm
   ${Boost_SYSTEM_LIBRARY}
   ${Boost_FILESYSTEM_LIBRARY}
   ${MY_ANTPM_LIBRARIES}
-  ${Boost_LIBRARIES}
 )
 
 ADD_EXECUTABLE(antpm-usbmon2ant

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-running/antpm.git