From 0ed51357721b5e01108014606c0e7ad5c2599c52 Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 13:32:39 +0100 Subject: [PATCH 01/24] cmake and travis support added --- .travis.yml | 42 ++++++++++++++++ CMakeLists.txt | 57 ++++++++++++++++++++++ src/CMakeLists.txt | 26 ++++++++++ unitTests/CMakeLists.txt | 3 ++ unitTests/wavelibBoostTests/CMakeLists.txt | 34 +++++++++++++ 5 files changed, 162 insertions(+) create mode 100644 .travis.yml create mode 100644 CMakeLists.txt create mode 100644 src/CMakeLists.txt create mode 100644 unitTests/CMakeLists.txt create mode 100644 unitTests/wavelibBoostTests/CMakeLists.txt diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..78636af --- /dev/null +++ b/.travis.yml @@ -0,0 +1,42 @@ +sudo: false + +addons: + apt: + sources: + - kalakris-cmake + - kubuntu-backports + - boost-latest + packages: + - cmake + - libboost1.55-all-dev + +language: cpp + +os: + - linux + - osx + +compiler: + - gcc + - clang + +env: + - BUILD_CONFIG=Release + - BUILD_CONFIG=Debug + +matrix: + allow_failures: + - compiler: clang + +before_install: + +install: + +before_script: + - mkdir build.ci + - cd build.ci + - cmake .. -DBUILD_UT=ON -DCMAKE_BUILD_TYPE=$BUILD_CONFIG + +script: + - cmake --build . + - ctest -VV diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..d1b5215 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,57 @@ +cmake_minimum_required(VERSION 3.0) + +project(wavelib VERSION 1.0) + +# src root path +set(WAVELIB_SRC_ROOT ${PROJECT_SOURCE_DIR} CACHE PATH "Wavelib source root") +# binary output by default +set(COMMON_BIN_PATH ${CMAKE_BINARY_DIR}/Bin) +set(LIBRARY_OUTPUT_PATH ${COMMON_BIN_PATH}/${CMAKE_BUILD_TYPE}) +set(EXECUTABLE_OUTPUT_PATH ${COMMON_BIN_PATH}/${CMAKE_BUILD_TYPE}) +# set where to find additional cmake modules if any +set(CMAKE_MODULE_PATH ${WAVELIB_SRC_ROOT}/cmake ${CMAKE_MODULE_PATH}) + + +option(BUILD_UT "Enable Unit test" ON) + +# make include globaly visible +set(PROJECT_WIDE_INCLUDE ${WAVELIB_SRC_ROOT}/include) +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_RUNTIME OFF) + +find_package(Boost COMPONENTS unit_test_framework REQUIRED) +if (Boost_FOUND) + # disable autolinking feature + add_definitions(-DBOOST_ALL_NO_LIB) + include_directories(${Boost_INCLUDE_DIRS}) +else() + message(FATAL_ERROR "Boost >= 1.35 required for testing wavelib") +endif() + +if(BUILD_UT) + include(CTest) + enable_testing() + add_subdirectory(unitTests) + add_custom_target(CopyDataFiles + + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/signal.txt ${COMMON_BIN_PATH}/Debug + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/signal.txt ${COMMON_BIN_PATH}/Release + + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/x1.txt ${COMMON_BIN_PATH}/Debug + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/x1.txt ${COMMON_BIN_PATH}/Release + + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/x2.txt ${COMMON_BIN_PATH}/Debug + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/x2.txt ${COMMON_BIN_PATH}/Release + + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/s1.txt ${COMMON_BIN_PATH}/Debug + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/s1.txt ${COMMON_BIN_PATH}/Release + ) + + add_dependencies(wavelibLibTests CopyDataFiles) +endif() + +add_subdirectory(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..58f085e --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,26 @@ + + +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + +set(SOURCE_FILES conv.c + hsfft.c + real.c + wavefilt.c + wavelib.c + wtmath.c + ) + +set(HEADER_FILES conv.h + hsfft.h + real.h + wavefilt.h + wavelib.h + wtmath.h + ) + +add_library(wavelib STATIC ${SOURCE_FILES} ${HEADER_FILES}) + +set_property(TARGET wavelib PROPERTY FOLDER "lib") + +target_include_directories(wavelib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + diff --git a/unitTests/CMakeLists.txt b/unitTests/CMakeLists.txt new file mode 100644 index 0000000..dbee49a --- /dev/null +++ b/unitTests/CMakeLists.txt @@ -0,0 +1,3 @@ + +add_subdirectory(wavelibBoostTests) + diff --git a/unitTests/wavelibBoostTests/CMakeLists.txt b/unitTests/wavelibBoostTests/CMakeLists.txt new file mode 100644 index 0000000..715e67e --- /dev/null +++ b/unitTests/wavelibBoostTests/CMakeLists.txt @@ -0,0 +1,34 @@ +enable_testing() + + +set(SOURCE_FILES + tst_dwt.cpp + BoostTest.cpp + ) + +set(HEADER_FILES + BoostTest.h + ) + + + + + +add_executable(wavelibLibTests ${SOURCE_FILES} ${HEADER_FILES}) + +add_test(NAME wavelibTests COMMAND wavelibTests) + +include_directories(${BOOST_DIR}) +add_dependencies(wavelibLibTests wavelib) +target_link_libraries(wavelibLibTests ${Boost_LIBRARIES} + wavelib) + +target_include_directories(wavelibLibTests PUBLIC + ${CMAKE_SOURCE_DIR}/../../header + ${Boost_INCLUDE_DIR} + ) + +target_compile_definitions(wavelibLibTests PUBLIC BOOST_ALL_NO_LIB UNIT_TEST) + +file( MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/Debug") +file( MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/Release") From d68b19c1c87980ad796a39ecb01754f9fb3c521f Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 13:42:52 +0100 Subject: [PATCH 02/24] some improvements --- CMakeLists.txt | 4 +++- unitTests/wavelibBoostTests/CMakeLists.txt | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d1b5215..a0c5278 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,12 +32,14 @@ else() message(FATAL_ERROR "Boost >= 1.35 required for testing wavelib") endif() + if(BUILD_UT) include(CTest) enable_testing() add_subdirectory(unitTests) + add_custom_target(CopyDataFiles - + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/signal.txt ${COMMON_BIN_PATH}/Debug COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/signal.txt ${COMMON_BIN_PATH}/Release diff --git a/unitTests/wavelibBoostTests/CMakeLists.txt b/unitTests/wavelibBoostTests/CMakeLists.txt index 715e67e..c56c194 100644 --- a/unitTests/wavelibBoostTests/CMakeLists.txt +++ b/unitTests/wavelibBoostTests/CMakeLists.txt @@ -30,5 +30,9 @@ target_include_directories(wavelibLibTests PUBLIC target_compile_definitions(wavelibLibTests PUBLIC BOOST_ALL_NO_LIB UNIT_TEST) -file( MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/Debug") -file( MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/Release") + +install(TARGETS wavelibLibTests + RUNTIME DESTINATION bin + LIBRARY DESTINATION tests + ARCHIVE DESTINATION tests + ) \ No newline at end of file From dd10c33a1a1ab178828139937b9299eabbd5bf02 Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 14:12:09 +0100 Subject: [PATCH 03/24] some changes in cmake --- CMakeLists.txt | 20 +++++++++++++++++++- unitTests/wavelibBoostTests/CMakeLists.txt | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a0c5278..a5292f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required(VERSION 3.0) -project(wavelib VERSION 1.0) +set(PROJECT_NAME wavelib) +project(${PROJECT_NAME} CXX C) + # src root path set(WAVELIB_SRC_ROOT ${PROJECT_SOURCE_DIR} CACHE PATH "Wavelib source root") @@ -12,8 +14,21 @@ set(EXECUTABLE_OUTPUT_PATH ${COMMON_BIN_PATH}/${CMAKE_BUILD_TYPE}) set(CMAKE_MODULE_PATH ${WAVELIB_SRC_ROOT}/cmake ${CMAKE_MODULE_PATH}) +set(WAVELIB_VERSION "1.0.0" CACHE STRING "Wavelib version" FORCE) +message(">>> Building Wavelib version: ${WAVELIB_VERSION}") +message(">>> EXECUTABLE_OUTPUT_PATH = ${EXECUTABLE_OUTPUT_PATH}") + option(BUILD_UT "Enable Unit test" ON) +# cleanup prefix lib for Unix-like OSes +set(CMAKE_SHARED_MODULE_PREFIX) + +# install target to this folder by default +set(WAVELIB_BINARY_DIR ${WAVELIB_SRC_ROOT}/bin) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${WAVELIB_BINARY_DIR}" CACHE PATH "default install path" FORCE) +endif() + # make include globaly visible set(PROJECT_WIDE_INCLUDE ${WAVELIB_SRC_ROOT}/include) include_directories(${PROJECT_WIDE_INCLUDE}) @@ -32,6 +47,7 @@ else() message(FATAL_ERROR "Boost >= 1.35 required for testing wavelib") endif() +include_directories(${COMMON_BIN_PATH}) if(BUILD_UT) include(CTest) @@ -57,3 +73,5 @@ if(BUILD_UT) endif() add_subdirectory(src) + +install(DIRECTORY ${WAVELIB_SRC_ROOT}/include/ DESTINATION include FILES_MATCHING PATTERN "*.h") \ No newline at end of file diff --git a/unitTests/wavelibBoostTests/CMakeLists.txt b/unitTests/wavelibBoostTests/CMakeLists.txt index c56c194..0c0b447 100644 --- a/unitTests/wavelibBoostTests/CMakeLists.txt +++ b/unitTests/wavelibBoostTests/CMakeLists.txt @@ -16,7 +16,7 @@ set(HEADER_FILES add_executable(wavelibLibTests ${SOURCE_FILES} ${HEADER_FILES}) -add_test(NAME wavelibTests COMMAND wavelibTests) +add_test(NAME wavelibTests WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND wavelibTests) include_directories(${BOOST_DIR}) add_dependencies(wavelibLibTests wavelib) From 8d1d842c9b188e2cec0bc32e4fb62e654058a672 Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 14:15:37 +0100 Subject: [PATCH 04/24] minimum cmake version changed --- CMakeLists.txt | 2 +- unitTests/wavelibBoostTests/CMakeLists.txt | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a5292f4..e77e2ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 2.8.10 FATAL_ERROR) set(PROJECT_NAME wavelib) project(${PROJECT_NAME} CXX C) diff --git a/unitTests/wavelibBoostTests/CMakeLists.txt b/unitTests/wavelibBoostTests/CMakeLists.txt index 0c0b447..53e68f0 100644 --- a/unitTests/wavelibBoostTests/CMakeLists.txt +++ b/unitTests/wavelibBoostTests/CMakeLists.txt @@ -1,5 +1,3 @@ -enable_testing() - set(SOURCE_FILES tst_dwt.cpp From 04548c820a54d2d97ce33f3656c22a08b9ba09aa Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 14:32:40 +0100 Subject: [PATCH 05/24] fix unit tests --- CMakeLists.txt | 17 ----------------- unitTests/wavelibBoostTests/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e77e2ae..a5c7a16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,23 +53,6 @@ if(BUILD_UT) include(CTest) enable_testing() add_subdirectory(unitTests) - - add_custom_target(CopyDataFiles - - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/signal.txt ${COMMON_BIN_PATH}/Debug - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/signal.txt ${COMMON_BIN_PATH}/Release - - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/x1.txt ${COMMON_BIN_PATH}/Debug - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/x1.txt ${COMMON_BIN_PATH}/Release - - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/x2.txt ${COMMON_BIN_PATH}/Debug - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/x2.txt ${COMMON_BIN_PATH}/Release - - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/s1.txt ${COMMON_BIN_PATH}/Debug - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/test/s1.txt ${COMMON_BIN_PATH}/Release - ) - - add_dependencies(wavelibLibTests CopyDataFiles) endif() add_subdirectory(src) diff --git a/unitTests/wavelibBoostTests/CMakeLists.txt b/unitTests/wavelibBoostTests/CMakeLists.txt index 53e68f0..5eef325 100644 --- a/unitTests/wavelibBoostTests/CMakeLists.txt +++ b/unitTests/wavelibBoostTests/CMakeLists.txt @@ -14,7 +14,7 @@ set(HEADER_FILES add_executable(wavelibLibTests ${SOURCE_FILES} ${HEADER_FILES}) -add_test(NAME wavelibTests WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} COMMAND wavelibTests) +add_test(NAME wavelibLibTests WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/test COMMAND wavelibLibTests) include_directories(${BOOST_DIR}) add_dependencies(wavelibLibTests wavelib) From effbfb463beab539661398dc78a09bea7ee5adde Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 14:40:04 +0100 Subject: [PATCH 06/24] travis updated --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 78636af..710c615 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,8 @@ addons: apt: sources: - kalakris-cmake - - kubuntu-backports - - boost-latest packages: - cmake - - libboost1.55-all-dev language: cpp @@ -33,6 +30,8 @@ before_install: install: before_script: + - sudo apt-get update -qq + - sudo apt-get install libboost-test-dev - mkdir build.ci - cd build.ci - cmake .. -DBUILD_UT=ON -DCMAKE_BUILD_TYPE=$BUILD_CONFIG From e39fce2a16fc62dd6a40f22d2c831685763fcb6b Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 14:42:04 +0100 Subject: [PATCH 07/24] travis changed --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 710c615..4fd465a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -sudo: false +sudo: true addons: apt: From d14625157127f1909ec0b89436b9d34b796e48a3 Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 14:50:51 +0100 Subject: [PATCH 08/24] travis changed back --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4fd465a..78636af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,14 @@ -sudo: true +sudo: false addons: apt: sources: - kalakris-cmake + - kubuntu-backports + - boost-latest packages: - cmake + - libboost1.55-all-dev language: cpp @@ -30,8 +33,6 @@ before_install: install: before_script: - - sudo apt-get update -qq - - sudo apt-get install libboost-test-dev - mkdir build.ci - cd build.ci - cmake .. -DBUILD_UT=ON -DCMAKE_BUILD_TYPE=$BUILD_CONFIG From d66c84f96c14739561a589ea3aa6b1f6b99c523a Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 15:04:20 +0100 Subject: [PATCH 09/24] changed std::sqrt to sqrt --- .travis.yml | 1 - unitTests/wavelibBoostTests/tst_dwt.cpp | 42 ++++++++++++------------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 78636af..19a6203 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ addons: language: cpp os: - - linux - osx compiler: diff --git a/unitTests/wavelibBoostTests/tst_dwt.cpp b/unitTests/wavelibBoostTests/tst_dwt.cpp index 7c650b3..a08eb39 100644 --- a/unitTests/wavelibBoostTests/tst_dwt.cpp +++ b/unitTests/wavelibBoostTests/tst_dwt.cpp @@ -230,9 +230,9 @@ BOOST_AUTO_TEST_CASE(DBCoefTests) char * name = new char[waveletNames[j].size() + 1]; memcpy(name, waveletNames[j].c_str(), waveletNames[j].size() + 1); obj = wave_init(name);// Initialize the wavelet - BOOST_CHECK_SMALL(sum1(obj->lpr, obj->lpr_len) - std::sqrt(2.0), epsilon); - BOOST_CHECK_SMALL(sum2(obj->lpr, obj->lpr_len) - 1. / std::sqrt(2.0), epsilon); - BOOST_CHECK_SMALL(sum3(obj->lpr, obj->lpr_len) - 1. / std::sqrt(2.0), epsilon); + BOOST_CHECK_SMALL(sum1(obj->lpr, obj->lpr_len) - sqrt(2.0), epsilon); + BOOST_CHECK_SMALL(sum2(obj->lpr, obj->lpr_len) - 1. / sqrt(2.0), epsilon); + BOOST_CHECK_SMALL(sum3(obj->lpr, obj->lpr_len) - 1. / sqrt(2.0), epsilon); BOOST_CHECK_SMALL(sum4(obj->lpr, obj->lpr_len) - 1., epsilon); for (int m = 1; m < (obj->lpr_len / 2) - 1;m++) BOOST_CHECK_SMALL(sum5(obj->lpr, obj->lpr_len, m), epsilon); @@ -257,9 +257,9 @@ BOOST_AUTO_TEST_CASE(CoifCoefTests) char * name = new char[waveletNames[j].size() + 1]; memcpy(name, waveletNames[j].c_str(), waveletNames[j].size() + 1); obj = wave_init(name);// Initialize the wavelet - BOOST_CHECK_SMALL(sum1(obj->lpr, obj->lpr_len) - std::sqrt(2.0), epsilon); - BOOST_CHECK_SMALL(sum2(obj->lpr, obj->lpr_len) - 1. / std::sqrt(2.0), epsilon); - BOOST_CHECK_SMALL(sum3(obj->lpr, obj->lpr_len) - 1. / std::sqrt(2.0), epsilon); + BOOST_CHECK_SMALL(sum1(obj->lpr, obj->lpr_len) - sqrt(2.0), epsilon); + BOOST_CHECK_SMALL(sum2(obj->lpr, obj->lpr_len) - 1. / sqrt(2.0), epsilon); + BOOST_CHECK_SMALL(sum3(obj->lpr, obj->lpr_len) - 1. / sqrt(2.0), epsilon); BOOST_CHECK_SMALL(sum4(obj->lpr, obj->lpr_len) - 1., epsilon); for (int m = 1; m < (obj->lpr_len / 2) - 1; m++) BOOST_CHECK_SMALL(sum5(obj->lpr, obj->lpr_len, m), epsilon); @@ -282,9 +282,9 @@ BOOST_AUTO_TEST_CASE(SymCoefTests) char * name = new char[waveletNames[j].size() + 1]; memcpy(name, waveletNames[j].c_str(), waveletNames[j].size() + 1); obj = wave_init(name);// Initialize the wavelet - BOOST_CHECK_SMALL(sum1(obj->lpr, obj->lpr_len) - std::sqrt(2.0), epsilon); - BOOST_CHECK_SMALL(sum2(obj->lpr, obj->lpr_len) - 1. / std::sqrt(2.0), epsilon); - BOOST_CHECK_SMALL(sum3(obj->lpr, obj->lpr_len) - 1. / std::sqrt(2.0), epsilon); + BOOST_CHECK_SMALL(sum1(obj->lpr, obj->lpr_len) - sqrt(2.0), epsilon); + BOOST_CHECK_SMALL(sum2(obj->lpr, obj->lpr_len) - 1. / sqrt(2.0), epsilon); + BOOST_CHECK_SMALL(sum3(obj->lpr, obj->lpr_len) - 1. / sqrt(2.0), epsilon); BOOST_CHECK_SMALL(sum4(obj->lpr, obj->lpr_len) - 1., epsilon); for (int m = 1; m < (obj->lpr_len / 2) - 1; m++) BOOST_CHECK_SMALL(sum5(obj->lpr, obj->lpr_len, m), epsilon); @@ -318,13 +318,13 @@ BOOST_AUTO_TEST_CASE(BiorCoefTests) char * name = new char[waveletNames[j].size() + 1]; memcpy(name, waveletNames[j].c_str(), waveletNames[j].size() + 1); obj = wave_init(name);// Initialize the wavelet - BOOST_CHECK_SMALL(sum1(obj->lpr, obj->lpr_len) - std::sqrt(2.0), epsilon); - BOOST_CHECK_SMALL(sum1(obj->lpd, obj->lpd_len) - std::sqrt(2.0), epsilon); - BOOST_CHECK_SMALL(sum2(obj->lpr, obj->lpr_len) - 1. / std::sqrt(2.0), epsilon); - BOOST_CHECK_SMALL(sum2(obj->lpd, obj->lpd_len) - 1. / std::sqrt(2.0), epsilon); + BOOST_CHECK_SMALL(sum1(obj->lpr, obj->lpr_len) - sqrt(2.0), epsilon); + BOOST_CHECK_SMALL(sum1(obj->lpd, obj->lpd_len) - sqrt(2.0), epsilon); + BOOST_CHECK_SMALL(sum2(obj->lpr, obj->lpr_len) - 1. / sqrt(2.0), epsilon); + BOOST_CHECK_SMALL(sum2(obj->lpd, obj->lpd_len) - 1. / sqrt(2.0), epsilon); - BOOST_CHECK_SMALL(sum3(obj->lpr, obj->lpr_len) - 1. / std::sqrt(2.0), epsilon); - BOOST_CHECK_SMALL(sum3(obj->lpd, obj->lpd_len) - 1. / std::sqrt(2.0), epsilon); + BOOST_CHECK_SMALL(sum3(obj->lpr, obj->lpr_len) - 1. / sqrt(2.0), epsilon); + BOOST_CHECK_SMALL(sum3(obj->lpd, obj->lpd_len) - 1. / sqrt(2.0), epsilon); wave_free(obj); } } @@ -355,13 +355,13 @@ BOOST_AUTO_TEST_CASE(RBiorCoefTests) char * name = new char[waveletNames[j].size() + 1]; memcpy(name, waveletNames[j].c_str(), waveletNames[j].size() + 1); obj = wave_init(name);// Initialize the wavelet - BOOST_CHECK_SMALL(sum1(obj->lpr, obj->lpr_len) - std::sqrt(2.0), epsilon); - BOOST_CHECK_SMALL(sum1(obj->lpd, obj->lpd_len) - std::sqrt(2.0), epsilon); - BOOST_CHECK_SMALL(sum2(obj->lpr, obj->lpr_len) - 1. / std::sqrt(2.0), epsilon); - BOOST_CHECK_SMALL(sum2(obj->lpd, obj->lpd_len) - 1. / std::sqrt(2.0), epsilon); + BOOST_CHECK_SMALL(sum1(obj->lpr, obj->lpr_len) - sqrt(2.0), epsilon); + BOOST_CHECK_SMALL(sum1(obj->lpd, obj->lpd_len) - sqrt(2.0), epsilon); + BOOST_CHECK_SMALL(sum2(obj->lpr, obj->lpr_len) - 1. / sqrt(2.0), epsilon); + BOOST_CHECK_SMALL(sum2(obj->lpd, obj->lpd_len) - 1. / sqrt(2.0), epsilon); - BOOST_CHECK_SMALL(sum3(obj->lpr, obj->lpr_len) - 1. / std::sqrt(2.0), epsilon); - BOOST_CHECK_SMALL(sum3(obj->lpd, obj->lpd_len) - 1. / std::sqrt(2.0), epsilon); + BOOST_CHECK_SMALL(sum3(obj->lpr, obj->lpr_len) - 1. / sqrt(2.0), epsilon); + BOOST_CHECK_SMALL(sum3(obj->lpd, obj->lpd_len) - 1. / sqrt(2.0), epsilon); wave_free(obj); } } From 2cbc33003b45c0aec1a4aed355a4baf34ecf39c7 Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 15:21:41 +0100 Subject: [PATCH 10/24] use random numbers instead of s1.txt --- unitTests/wavelibBoostTests/tst_dwt.cpp | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/unitTests/wavelibBoostTests/tst_dwt.cpp b/unitTests/wavelibBoostTests/tst_dwt.cpp index a08eb39..f0a536f 100644 --- a/unitTests/wavelibBoostTests/tst_dwt.cpp +++ b/unitTests/wavelibBoostTests/tst_dwt.cpp @@ -7,9 +7,9 @@ #include #include #include -#include "../../src/wavelib.h" +#include "wavelib.h" #include - +#include double absmax(double *array, int N) { double max; @@ -94,22 +94,14 @@ BOOST_AUTO_TEST_CASE(ReconstructionTest) wave_object obj; wt_object wt; - double *inp,*out,*diff; + double *inp,*out; int N, i,J; double epsilon = 1e-15; - FILE *ifp; - double temp[79926]; + std::mt19937_64 rng; + rng.seed(1234); + // initialize a uniform distribution between 0 and 1 + std::uniform_real_distribution unif(0, 1); - - ifp = fopen("s1.txt", "r"); - //ifp = fopen("signal.txt", "r"); - i = 0; - BOOST_REQUIRE(ifp); - - while (!feof(ifp)) { - fscanf(ifp, "%lf \n", &temp[i]); - i++; - } N = 79926; //N = 256; @@ -119,7 +111,7 @@ BOOST_AUTO_TEST_CASE(ReconstructionTest) //wmean = mean(temp, N); for (i = 0; i < N; ++i) { - inp[i] = temp[i]; + inp[i] = unif(rng); } std::vector waveletNames; From 77982d9ee51d53639166b42fcf915714b4ed60bc Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 15:31:17 +0100 Subject: [PATCH 11/24] add appveyor --- appveyor.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..44f319b --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,16 @@ +os: Visual Studio 2015 + +platform: x64 + +environment: + BOOST_ROOT: C:\Libraries\boost_1_59_0 + BOOST_LIBRARYDIR: C:\Libraries\boost_1_59_0\lib64-msvc-14.0 + +build_script: + - mkdir build + - cd build + - cmake .. -G"Visual Studio 14 2015 Win64" + - cmake --build . --config Debug + +test_script: + - ctest -VV -C Debug \ No newline at end of file From f69134782270339b0365a18d5235a53f1428a11b Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 15:41:01 +0100 Subject: [PATCH 12/24] adding linux to travis --- .travis.yml | 1 + CMakeLists.txt | 12 +++++------- appveyor.yml | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 19a6203..78636af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ addons: language: cpp os: + - linux - osx compiler: diff --git a/CMakeLists.txt b/CMakeLists.txt index a5c7a16..73154f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,17 +35,15 @@ 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) -if (Boost_FOUND) + # disable autolinking feature - add_definitions(-DBOOST_ALL_NO_LIB) - include_directories(${Boost_INCLUDE_DIRS}) -else() - message(FATAL_ERROR "Boost >= 1.35 required for testing wavelib") -endif() +add_definitions(-DBOOST_ALL_NO_LIB) +include_directories(${Boost_INCLUDE_DIRS}) + include_directories(${COMMON_BIN_PATH}) diff --git a/appveyor.yml b/appveyor.yml index 44f319b..9d5d87c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ environment: build_script: - mkdir build - cd build - - cmake .. -G"Visual Studio 14 2015 Win64" + - cmake -G "Visual Studio 14 2015 Win64" .. - cmake --build . --config Debug test_script: From cf869ef0c4ddef206d5832858874acb11d4bcadd Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 16:07:01 +0100 Subject: [PATCH 13/24] 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 From 552034c74f7caf68001018b983a652c5233eeccf Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 16:22:18 +0100 Subject: [PATCH 14/24] USE_STATIC_BOOST has to used to define if boost is static or not --- .travis.yml | 2 +- CMakeLists.txt | 12 ++++++++++-- appveyor.yml | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 78636af..b7cec28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ install: before_script: - mkdir build.ci - cd build.ci - - cmake .. -DBUILD_UT=ON -DCMAKE_BUILD_TYPE=$BUILD_CONFIG + - cmake .. -DBUILD_UT=ON -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DUSE_STATIC_BOOST=YES script: - cmake --build . diff --git a/CMakeLists.txt b/CMakeLists.txt index 48582a1..e825a5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,10 +35,18 @@ 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_RUNTIME OFF) -find_package(Boost 1.40 COMPONENTS unit_test_framework REQUIRED) +set(Boost_USE_STATIC_LIBS ${USE_STATIC_BOOST}) +set(Boost_USE_MULTITHREADED ON) +unset(Boost_INCLUDE_DIR CACHE) +unset(Boost_LIBRARY_DIRS CACHE) +find_package(Boost REQUIRED COMPONENTS unit_test_framework) +if(USE_STATIC_BOOST) + message(STATUS "Linking against boost static libraries") +else(USE_STATIC_BOOST) + message(STATUS "Linking against boost dynamic libraries") +endif(USE_STATIC_BOOST) # disable autolinking feature add_definitions(-DBOOST_ALL_NO_LIB) diff --git a/appveyor.yml b/appveyor.yml index 9d5d87c..f6eaa8d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ environment: build_script: - mkdir build - cd build - - cmake -G "Visual Studio 14 2015 Win64" .. + - cmake -G "Visual Studio 14 2015 Win64" -DUSE_STATIC_BOOST=NO .. - cmake --build . --config Debug test_script: From ce2a416bda4eb93155ff0984ef9a55984785b050 Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 16:32:33 +0100 Subject: [PATCH 15/24] try to repair travis for linux --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b7cec28..9d5dfcc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,3 @@ -sudo: false addons: apt: @@ -29,7 +28,7 @@ matrix: - compiler: clang before_install: - + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libboost-dev ; fi install: before_script: From 32738628ee02de758d99c3f7a5890fc2cc5d25c7 Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 16:36:54 +0100 Subject: [PATCH 16/24] fix apt-get --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9d5dfcc..a714ed6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ matrix: - compiler: clang before_install: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libboost-dev ; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libboost-all-dev ; fi install: before_script: From 895e1a1f3b3910df8a4de099ae03b94e4baf53b9 Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 16:41:01 +0100 Subject: [PATCH 17/24] travis try to fix --- .travis.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index a714ed6..6cc6655 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,4 @@ -addons: - apt: - sources: - - kalakris-cmake - - kubuntu-backports - - boost-latest - packages: - - cmake - - libboost1.55-all-dev - language: cpp os: @@ -28,7 +18,8 @@ matrix: - compiler: clang before_install: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libboost-all-dev ; fi + - sudo apt-get update -qq + - sudo apt-get install -qq libboost-system-dev libboost-thread-dev libboost-test-dev libtinyxml-dev install: before_script: From da84e602bc5e07d26b689db7f26992b46bbd691e Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 17:08:04 +0100 Subject: [PATCH 18/24] new fix --- .travis.yml | 64 +++++++++++++++++++++++++++++++++----------------- CMakeLists.txt | 2 +- 2 files changed, 43 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6cc6655..42aa94f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,32 +1,52 @@ - +sudo: false language: cpp - os: - - linux - - osx - -compiler: - - gcc - - clang - + - linux + - osx +cache: + directories: + - compiler/.cabal-sandbox + - cs/packages env: - - BUILD_CONFIG=Release - - BUILD_CONFIG=Debug - + - LANG=cpp-clang + - LANG=cpp-gcc +addons: + apt: + sources: + - boost-latest + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + - libboost1.55-all-dev matrix: - allow_failures: - - compiler: clang + exclude: + # linux VM is too small to build C++ unit tests with g++ + - os: linux + env: LANG=cpp-gcc + # linux C++ build/test already includes Python + - os: linux + env: LANG=cpp-clang + - os: osx + env: LANG=cpp-gcc + - os: osx + env: LANG=cpp-clang before_install: - - sudo apt-get update -qq - - sudo apt-get install -qq libboost-system-dev libboost-thread-dev libboost-test-dev libtinyxml-dev -install: + # select C++ compiler + - export CXX="clang++" CC="clang" + - if [[ $LANG == *gcc ]]; then export CXX="g++-4.8" CC="gcc-4.8"; fi + # linux prereqisite packages + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then wget --no-check-certificate https://www.cmake.org/files/v3.2/cmake-3.2.3-Linux-x86_64.tar.gz; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then tar -xzvf cmake-3.2.3-Linux-x86_64.tar.gz; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PATH=$PWD/cmake-3.2.3-Linux-x86_64/bin:$PATH; fi + # OS X prerequisite packages + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi before_script: - - mkdir build.ci - - cd build.ci - - cmake .. -DBUILD_UT=ON -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DUSE_STATIC_BOOST=YES + script: - - cmake --build . - - ctest -VV + - mkdir build.ci && cd build.ci + - cmake .. -DBUILD_UT=ON -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DUSE_STATIC_BOOST=YES + - cmake --build . + - ctest -VV diff --git a/CMakeLists.txt b/CMakeLists.txt index e825a5f..095ec64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.10 FATAL_ERROR) +cmake_minimum_required(VERSION 2.8.0 FATAL_ERROR) set(PROJECT_NAME wavelib) project(${PROJECT_NAME} CXX C) From e2ff743cbec7b63f008f9856c52a7b622cb65b98 Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 17:33:24 +0100 Subject: [PATCH 19/24] - --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 42aa94f..2b629b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,8 +39,6 @@ before_install: - if [ "$TRAVIS_OS_NAME" == "linux" ]; then wget --no-check-certificate https://www.cmake.org/files/v3.2/cmake-3.2.3-Linux-x86_64.tar.gz; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then tar -xzvf cmake-3.2.3-Linux-x86_64.tar.gz; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PATH=$PWD/cmake-3.2.3-Linux-x86_64/bin:$PATH; fi - # OS X prerequisite packages - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi before_script: From e4a4d1a17da493b17994c8b13c7057d7969e02ff Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 19:09:10 +0100 Subject: [PATCH 20/24] fix travis --- .travis.yml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2b629b3..1bf37b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,7 @@ language: cpp os: - linux - osx -cache: - directories: - - compiler/.cabal-sandbox - - cs/packages + env: - LANG=cpp-clang - LANG=cpp-gcc @@ -18,18 +15,7 @@ addons: packages: - g++-4.8 - libboost1.55-all-dev -matrix: - exclude: - # linux VM is too small to build C++ unit tests with g++ - - os: linux - env: LANG=cpp-gcc - # linux C++ build/test already includes Python - - os: linux - env: LANG=cpp-clang - - os: osx - env: LANG=cpp-gcc - - os: osx - env: LANG=cpp-clang + before_install: # select C++ compiler From 47b28c620df87121ff5145d1545bfe520aef9485 Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 21:33:57 +0100 Subject: [PATCH 21/24] next try --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1bf37b9..8122d6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,23 +4,23 @@ os: - linux - osx -env: - - LANG=cpp-clang - - LANG=cpp-gcc +compiler: + - gcc + - clang + addons: apt: sources: - boost-latest - ubuntu-toolchain-r-test packages: - - g++-4.8 - libboost1.55-all-dev +matrix: + allow_failures: + - compiler: clang before_install: - # select C++ compiler - - export CXX="clang++" CC="clang" - - if [[ $LANG == *gcc ]]; then export CXX="g++-4.8" CC="gcc-4.8"; fi # linux prereqisite packages - if [ "$TRAVIS_OS_NAME" == "linux" ]; then wget --no-check-certificate https://www.cmake.org/files/v3.2/cmake-3.2.3-Linux-x86_64.tar.gz; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then tar -xzvf cmake-3.2.3-Linux-x86_64.tar.gz; fi From 0c7cd6018bb70ebb43723e6481767c5720ff3ea9 Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Thu, 10 Mar 2016 07:45:21 +0100 Subject: [PATCH 22/24] use different random generation --- unitTests/wavelibBoostTests/tst_dwt.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/unitTests/wavelibBoostTests/tst_dwt.cpp b/unitTests/wavelibBoostTests/tst_dwt.cpp index 88ace9a..acae8c9 100644 --- a/unitTests/wavelibBoostTests/tst_dwt.cpp +++ b/unitTests/wavelibBoostTests/tst_dwt.cpp @@ -109,10 +109,6 @@ BOOST_AUTO_TEST_CASE(ReconstructionTest) double *inp,*out; int N, i,J; double epsilon = 1e-15; - std::mt19937_64 rng; - rng.seed(1234); - // initialize a uniform distribution between 0 and 1 - std::uniform_real_distribution unif(0, 1); N = 79926; @@ -123,7 +119,7 @@ BOOST_AUTO_TEST_CASE(ReconstructionTest) //wmean = mean(temp, N); for (i = 0; i < N; ++i) { - inp[i] = unif(rng); + inp[i] = (rand() / (double)(RAND_MAX + 1)); } std::vector waveletNames; From 79d0802f391f3669bb1df8e7fd26ae66487a6e23 Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Thu, 10 Mar 2016 07:49:07 +0100 Subject: [PATCH 23/24] remove random header --- unitTests/wavelibBoostTests/tst_dwt.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/unitTests/wavelibBoostTests/tst_dwt.cpp b/unitTests/wavelibBoostTests/tst_dwt.cpp index acae8c9..d9d96b8 100644 --- a/unitTests/wavelibBoostTests/tst_dwt.cpp +++ b/unitTests/wavelibBoostTests/tst_dwt.cpp @@ -11,7 +11,6 @@ #include "wavelib.h" #include -#include namespace patch { From f0339fbc4b0833d9600b2e0e4a620e8abfa4fee4 Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Fri, 11 Mar 2016 11:07:13 +0100 Subject: [PATCH 24/24] remove include_directories(${BOOST_DIR}) --- unitTests/wavelibBoostTests/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/unitTests/wavelibBoostTests/CMakeLists.txt b/unitTests/wavelibBoostTests/CMakeLists.txt index 5eef325..ecca34b 100644 --- a/unitTests/wavelibBoostTests/CMakeLists.txt +++ b/unitTests/wavelibBoostTests/CMakeLists.txt @@ -16,7 +16,6 @@ add_executable(wavelibLibTests ${SOURCE_FILES} ${HEADER_FILES}) add_test(NAME wavelibLibTests WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/test COMMAND wavelibLibTests) -include_directories(${BOOST_DIR}) add_dependencies(wavelibLibTests wavelib) target_link_libraries(wavelibLibTests ${Boost_LIBRARIES} wavelib)