guilhem_lavaux/vide_public
0
0
Fork 0
mirror of https://bitbucket.org/cosmicvoids/vide_public.git synced 2025-07-04 15:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixlets to have cosmotool compile

Browse source
This commit is contained in:
Guilhem Lavaux 2016-01-27 14:59:50 +01:00
parent 859e82cafd
commit 2fc406af45
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
external/cosmotool/CMakeLists.txt vendored
View file

@ -47,6 +47,10 @@ if (ENABLE_SHARP)
endif (ENABLE_SHARP) endif (ENABLE_SHARP)
find_package(Boost 1.53)
mark_as_advanced(Boost_INCLUDE_DIRS Boost_LIBRARIES)
set(HDF5_FIND_COMPONENTS HL CXX) set(HDF5_FIND_COMPONENTS HL CXX)
if(HDF5_ROOTDIR) if(HDF5_ROOTDIR)
SET(ENV{HDF5_ROOT} ${HDF5_ROOTDIR}) SET(ENV{HDF5_ROOT} ${HDF5_ROOTDIR})

2
external/cosmotool/src/CMakeLists.txt vendored
View file

@ -55,7 +55,7 @@ SET(CosmoTool_SRCS ${CosmoTool_SRCS}
growthFactor.hpp 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}) set(CosmoTool_LIBS ${NETCDFCPP_LIBRARY} ${NETCDF_LIBRARY} ${GSL_LIBRARIES})
if (HDF5_FOUND) if (HDF5_FOUND)

2
external/external_build.cmake vendored
View file

@ -241,6 +241,8 @@ ExternalProject_Add(cosmotool
-DNETCDF_LIBRARY=${NETCDF_LIBRARY} -DNETCDF_LIBRARY=${NETCDF_LIBRARY}
-DNETCDFCPP_LIBRARY=${NETCDFCPP_LIBRARY} -DNETCDFCPP_LIBRARY=${NETCDFCPP_LIBRARY}
-DENABLE_SHARP=OFF -DENABLE_SHARP=OFF
-DBOOST_INCLUDEDIR=${Boost_INCLUDE_DIRS}
) )
SET(COSMOTOOL_LIBRARY ${CMAKE_BINARY_DIR}/ext_build/cosmotool/lib/libCosmoTool.a) SET(COSMOTOOL_LIBRARY ${CMAKE_BINARY_DIR}/ext_build/cosmotool/lib/libCosmoTool.a)
set(COSMOTOOL_INCLUDE_PATH ${CMAKE_BINARY_DIR}/ext_build/cosmotool/include) set(COSMOTOOL_INCLUDE_PATH ${CMAKE_BINARY_DIR}/ext_build/cosmotool/include)