cleanup

CMakeLists.txt

@@ -30,7 +30,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 endif()
 
 # make include globaly visible
-set(PROJECT_WIDE_INCLUDE ${WAVELIB_SRC_ROOT}/include)
+set(PROJECT_WIDE_INCLUDE ${WAVELIB_SRC_ROOT}/header)
 include_directories(${PROJECT_WIDE_INCLUDE})
 
 

auxiliary/denoise.c

@@ -4,7 +4,7 @@
 #include <string.h>
 
 #include "waux.h"
-#include "wauxlib.h"
+#include "../header/wauxlib.h"
 
 denoise_object denoise_init(int length, int J,const char* wname) {
 	denoise_object obj = NULL;

auxiliary/waux.c

@@ -1,4 +1,4 @@
-#include "wauxlib.h"
+#include "../header/wauxlib.h"
 #include "waux.h"
 
 int compare_double(const void* a, const void* b)

src/CMakeLists.txt

@@ -27,5 +27,5 @@ add_library(wavelib STATIC ${SOURCE_FILES} ${HEADER_FILES})
         
 set_property(TARGET wavelib PROPERTY FOLDER "lib")
 
-target_include_directories(wavelib PUBLIC ${CMAKE_SOURCE_DIR}/header)
+target_include_directories(wavelib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}../header)
 

src/hsfft.h

@@ -12,7 +12,7 @@
 #include <math.h>
 #include <string.h>
 
-#include "wavelib.h"
+#include "../header/wavelib.h"
 
 #ifdef __cplusplus
 extern "C" {

src/wavelib.c

@@ -8,7 +8,7 @@
 #include <string.h>
 
 #include "cwt.h"
-#include "wavelib.h"
+#include "../header/wavelib.h"
 #include "wtmath.h"
 
 wave_object wave_init(const char* wname) {

unitTests/wavelibBoostTests/BoostTest.cpp

@@ -1,5 +0,0 @@
-
-
-#define BOOST_TEST_MODULE WaveLibTests
-
-#include <boost/test/included/unit_test.hpp>

unitTests/wavelibBoostTests/BoostTest.h

@@ -1,10 +0,0 @@
-
-
-#ifndef SWALLOWING_BOOSTTEST_H_
-#define SWALLOWING_BOOSTTEST_H_
-
-// we use the header only version of boost unit test
-#define BOOST_TEST_NO_LIB
-#include <boost/test/unit_test.hpp>
-
-#endif // SWALLOWING_BOOSTTEST_H_

unitTests/wavelibBoostTests/CMakeLists.txt

@@ -16,7 +16,7 @@ add_dependencies(wavelibLibTests wavelib)
 target_link_libraries(wavelibLibTests wavelib)
 
 target_include_directories(wavelibLibTests PUBLIC
-							${CMAKE_SOURCE_DIR}/../../header
+							${CMAKE_CURRENT_SOURCE_DIR}/../../header
                             )
                             
 

unitTests/wavelibBoostTests/tst_dwt.cpp

@@ -10,7 +10,7 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "wavelib.h"
+#include "../../header/wavelib.h"
 
 #include<vector>