diff --git a/CMakeLists.txt b/CMakeLists.txt index e2e45f6..1830463 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,6 +31,8 @@ find_library(NETCDF_LIBRARY netcdf) find_library(GSL_LIBRARY gsl) find_library(GSLCBLAS_LIBRARY gslcblas) +find_package(Boost 1.53) + if (ENABLE_SHARP) SET(SHARP_SOURCE ${CMAKE_SOURCE_DIR}/external/sharp) SET(DEP_BUILD ${CMAKE_SOURCE_DIR}/external/sharp/auto) diff --git a/sample/CMakeLists.txt b/sample/CMakeLists.txt index e7f60fe..a333aff 100644 --- a/sample/CMakeLists.txt +++ b/sample/CMakeLists.txt @@ -1,5 +1,7 @@ SET(tolink ${GSL_LIBRARIES} CosmoTool ${CosmoTool_LIBS}) -include_directories(${CMAKE_SOURCE_DIR}/src ${FFTW3_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS} ${NETCDF_INCLUDE_PATH} ${GSL_INCLUDE_PATH}) +include_directories(${CMAKE_SOURCE_DIR}/src) +include_directories(${FFTW3_INCLUDE_DIRS} +${EIGEN3_INCLUDE_DIRS} ${NETCDF_INCLUDE_PATH} ${GSL_INCLUDE_PATH}) IF(SHARP_INCLUDE_PATH) include_directories(BEFORE ${SHARP_INCLUDE_PATH}) @@ -11,9 +13,6 @@ target_link_libraries(testBQueue ${tolink}) add_executable(testInterpolate testInterpolate.cpp) target_link_libraries(testInterpolate ${tolink}) -add_executable(testSmooth testSmooth.cpp) -target_link_libraries(testSmooth ${tolink}) - add_executable(testkd testkd.cpp) target_link_libraries(testkd ${tolink}) @@ -69,6 +68,12 @@ endif (ENABLE_SHARP AND SHARP_LIBRARY AND SHARP_INCLUDE_PATH AND EIGEN3_FOUND) add_executable(test_cosmopower test_cosmopower.cpp) target_link_libraries(test_cosmopower ${tolink}) +if (Boost_FOUND) + include_directories(${Boost_INCLUDE_DIRS}) -add_executable(simple3DFilter simple3DFilter.cpp) -target_link_libraries(simple3DFilter ${tolink}) + add_executable(testSmooth testSmooth.cpp) + target_link_libraries(testSmooth ${tolink}) + + add_executable(simple3DFilter simple3DFilter.cpp) + target_link_libraries(simple3DFilter ${tolink}) +endif (Boost_FOUND) diff --git a/sample/simple3DFilter.cpp b/sample/simple3DFilter.cpp index 8b91332..b7d1498 100644 --- a/sample/simple3DFilter.cpp +++ b/sample/simple3DFilter.cpp @@ -1,8 +1,8 @@ #include -#include -#include -#include -#include +#include "yorick.hpp" +#include "sphSmooth.hpp" +#include "mykdtree.hpp" +#include "miniargs.hpp" using namespace std; using namespace CosmoTool;