From 2fc406af458980e1969c5edb346aae6cb54f2544 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Wed, 27 Jan 2016 14:59:50 +0100 Subject: [PATCH] Fixlets to have cosmotool compile --- external/cosmotool/CMakeLists.txt | 4 ++++ external/cosmotool/src/CMakeLists.txt | 2 +- external/external_build.cmake | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/external/cosmotool/CMakeLists.txt b/external/cosmotool/CMakeLists.txt index 7faca8a..2cd377c 100644 --- a/external/cosmotool/CMakeLists.txt +++ b/external/cosmotool/CMakeLists.txt @@ -47,6 +47,10 @@ if (ENABLE_SHARP) endif (ENABLE_SHARP) +find_package(Boost 1.53) +mark_as_advanced(Boost_INCLUDE_DIRS Boost_LIBRARIES) + + set(HDF5_FIND_COMPONENTS HL CXX) if(HDF5_ROOTDIR) SET(ENV{HDF5_ROOT} ${HDF5_ROOTDIR}) diff --git a/external/cosmotool/src/CMakeLists.txt b/external/cosmotool/src/CMakeLists.txt index 8901027..e28a2d8 100644 --- a/external/cosmotool/src/CMakeLists.txt +++ b/external/cosmotool/src/CMakeLists.txt @@ -55,7 +55,7 @@ SET(CosmoTool_SRCS ${CosmoTool_SRCS} growthFactor.hpp ) -include_directories(${GSL_INCLUDE_PATH} ${NETCDF_INCLUDE_PATH} ${NETCDFCPP_INCLUDE_PATH} ${CMAKE_BINARY_DIR}/src) +include_directories(${Boost_INCLUDE_DIRS} ${GSL_INCLUDE_PATH} ${NETCDF_INCLUDE_PATH} ${NETCDFCPP_INCLUDE_PATH} ${CMAKE_BINARY_DIR}/src) set(CosmoTool_LIBS ${NETCDFCPP_LIBRARY} ${NETCDF_LIBRARY} ${GSL_LIBRARIES}) if (HDF5_FOUND) diff --git a/external/external_build.cmake b/external/external_build.cmake index bce5995..88ce453 100644 --- a/external/external_build.cmake +++ b/external/external_build.cmake @@ -241,6 +241,8 @@ ExternalProject_Add(cosmotool -DNETCDF_LIBRARY=${NETCDF_LIBRARY} -DNETCDFCPP_LIBRARY=${NETCDFCPP_LIBRARY} -DENABLE_SHARP=OFF + -DBOOST_INCLUDEDIR=${Boost_INCLUDE_DIRS} + ) SET(COSMOTOOL_LIBRARY ${CMAKE_BINARY_DIR}/ext_build/cosmotool/lib/libCosmoTool.a) set(COSMOTOOL_INCLUDE_PATH ${CMAKE_BINARY_DIR}/ext_build/cosmotool/include)