Mercurial > dedupe
changeset 67:2f45385195ae
Choose between static and dynamic compilation.
| author | Tom Fredrik Blenning Klaussen <bfg@bfgconsult.no> |
|---|---|
| date | Sun, 23 Dec 2012 22:08:32 +0100 |
| parents | a60c26e34d1a |
| children | f3d4aba620cc |
| files | CMakeLists.txt TestFramework.hpp |
| diffstat | 2 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Sun Dec 23 22:07:57 2012 +0100 +++ b/CMakeLists.txt Sun Dec 23 22:08:32 2012 +0100 @@ -11,10 +11,18 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMake_Modules/") -SET(Boost_USE_STATIC_LIBS OFF) +SET(USE_HEADERS_FOR_BOOST_TEST OFF) + SET(Boost_USE_MULTITHREADED ON) SET(Boost_USE_STATIC_RUNTIME OFF) -FIND_PACKAGE(Boost COMPONENTS filesystem system) +IF(USE_HEADERS_FOR_BOOST_TEST) + SET(Boost_USE_STATIC_LIBS OFF) + FIND_PACKAGE(Boost COMPONENTS filesystem system) + ADD_DEFINITIONS( "-DBOOSTTEST_HEADER_INCLUDE" ) +ELSE() + SET(Boost_USE_STATIC_LIBS ON) + FIND_PACKAGE(Boost COMPONENTS filesystem system test_exec_monitor) +ENDIF() IF (Boost_FOUND) INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR}) ADD_DEFINITIONS( "-DHAS_BOOST" ) @@ -84,8 +92,8 @@ -SET(CMAKE_CXX_FLAGS "-O3 -Wall") -#SET(CMAKE_CXX_FLAGS "-g2 -Wall -fno-inline") +#SET(CMAKE_CXX_FLAGS "-O3 -Wall") +SET(CMAKE_CXX_FLAGS "-g2 -Wall -fno-inline") ADD_EXECUTABLE(DeDupe Apps/DeDupe.cpp ${SOURCES} ${MOC_SOURCES}) TARGET_LINK_LIBRARIES(
--- a/TestFramework.hpp Sun Dec 23 22:07:57 2012 +0100 +++ b/TestFramework.hpp Sun Dec 23 22:08:32 2012 +0100 @@ -6,9 +6,6 @@ between headerincludes and dynamic linking */ -//This should really be defined from the build framework -#define BOOSTTEST_HEADER_INCLUDE - #define BOOST_TEST_MAIN #ifdef BOOSTTEST_HEADER_INCLUDE