From cf869ef0c4ddef206d5832858874acb11d4bcadd Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 16:07:01 +0100 Subject: [PATCH] some changes for cmake --- CMakeLists.txt | 4 ++-- unitTests/wavelibBoostTests/tst_dwt.cpp | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 73154f7..48582a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,10 +35,10 @@ include_directories(${PROJECT_WIDE_INCLUDE}) # TODO: need to handle this with option set(Boost_USE_MULTITHREADED ON) -set(Boost_USE_STATIC_LIBS ON) +# set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_RUNTIME OFF) -find_package(Boost COMPONENTS unit_test_framework REQUIRED) +find_package(Boost 1.40 COMPONENTS unit_test_framework REQUIRED) # disable autolinking feature add_definitions(-DBOOST_ALL_NO_LIB) diff --git a/unitTests/wavelibBoostTests/tst_dwt.cpp b/unitTests/wavelibBoostTests/tst_dwt.cpp index 0153732..88ace9a 100644 --- a/unitTests/wavelibBoostTests/tst_dwt.cpp +++ b/unitTests/wavelibBoostTests/tst_dwt.cpp @@ -8,8 +8,6 @@ #include #include -#include -#include #include "wavelib.h" #include