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

Fixes to cosmotool to make it compile correctly on more recent cmake

Browse source
This commit is contained in:
Guilhem Lavaux 2017-03-01 14:24:35 +01:00
parent ccf991e88f
commit c38bd70b64
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
external/cosmotool/CMakeLists.txt vendored
View file

@ -30,6 +30,8 @@ find_library(NETCDF_LIBRARY netcdf)
find_library(NETCDFCPP_LIBRARY NAMES netcdf_c++ netcdf_c++4) find_library(NETCDFCPP_LIBRARY NAMES netcdf_c++ netcdf_c++4)
find_library(GSL_LIBRARY gsl) find_library(GSL_LIBRARY gsl)
find_library(GSLCBLAS_LIBRARY gslcblas) find_library(GSLCBLAS_LIBRARY gslcblas)
find_library(ZLIB z)
find_library(LDLIB dl)
if (ENABLE_SHARP) if (ENABLE_SHARP)
SET(SHARP_SOURCE ${CMAKE_SOURCE_DIR}/external/sharp) SET(SHARP_SOURCE ${CMAKE_SOURCE_DIR}/external/sharp)
@ -48,14 +50,14 @@ endif (ENABLE_SHARP)
find_package(Boost 1.53) find_package(Boost 1.53)
message("INC DIRS: ${Boost_INCLUDE_DIRS}")
mark_as_advanced(Boost_INCLUDE_DIRS Boost_LIBRARIES) mark_as_advanced(Boost_INCLUDE_DIRS Boost_LIBRARIES)
set(HDF5_FIND_COMPONENTS HL CXX)
if(HDF5_ROOTDIR) if(HDF5_ROOTDIR)
SET(ENV{HDF5_ROOT} ${HDF5_ROOTDIR}) SET(ENV{HDF5_ROOT} ${HDF5_ROOTDIR})
endif(HDF5_ROOTDIR) endif(HDF5_ROOTDIR)
include(FindHDF5) find_package(HDF5 REQUIRED COMPONENTS HL CXX)
include(FindPkgConfig) include(FindPkgConfig)

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

@ -58,10 +58,12 @@ SET(CosmoTool_SRCS ${CosmoTool_SRCS}
include_directories(${Boost_INCLUDE_DIRS} ${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})
message("HDF5: ${HDF5_LIBRARIES} ${HDF5_INCLUDE_DIRS}")
if (HDF5_FOUND) if (HDF5_FOUND)
set(CosmoTool_LIBS ${CosmoTool_LIBS} ${HDF5_CXX_LIBRARIES} ${HDF5_LIBRARIES}) set(CosmoTool_LIBS ${CosmoTool_LIBS} ${HDF5_CXX_LIBRARIES} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES})
include_directories(${HDF5_INCLUDE_DIRS}) include_directories(${HDF5_INCLUDE_DIRS})
endif (HDF5_FOUND) endif (HDF5_FOUND)
set(CosmoTool_LIBS ${CosmoTool_LIBS} ${ZLIB} ${LDLIB})
set(CosmoTool_LIBS ${CosmoTool_LIBS} PARENT_SCOPE) set(CosmoTool_LIBS ${CosmoTool_LIBS} PARENT_SCOPE)

5
external/external_build.cmake vendored
View file

@ -177,6 +177,7 @@ mark_as_advanced(NETCDF_LIBRARY NETCDFCPP_LIBRARY NETCDF_INCLUDE_PATH NETCDFCPP_
if (INTERNAL_BOOST) if (INTERNAL_BOOST)
SET(BOOST_SOURCE_DIR ${BUILD_PREFIX}/boost-prefix/src/boost) SET(BOOST_SOURCE_DIR ${BUILD_PREFIX}/boost-prefix/src/boost)
SET(cosmotool_DEPS ${cosmotool_DEPS} boost)
ExternalProject_Add(boost ExternalProject_Add(boost
URL ${BOOST_URL} URL ${BOOST_URL}
PREFIX ${BUILD_PREFIX}/boost-prefix PREFIX ${BUILD_PREFIX}/boost-prefix
@ -230,6 +231,8 @@ ExternalProject_Add(cosmotool
PREFIX ${BUILD_PREFIX}/cosmotool-prefix PREFIX ${BUILD_PREFIX}/cosmotool-prefix
SOURCE_DIR ${CMAKE_SOURCE_DIR}/external/cosmotool SOURCE_DIR ${CMAKE_SOURCE_DIR}/external/cosmotool
CMAKE_ARGS CMAKE_ARGS
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DHDF5_DIR=${HDF5_ROOTDIR} -DHDF5_DIR=${HDF5_ROOTDIR}
-DHDF5_ROOTDIR=${HDF5_ROOTDIR} -DHDF5_ROOTDIR=${HDF5_ROOTDIR}
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/ext_build/cosmotool -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/ext_build/cosmotool
@ -241,7 +244,7 @@ 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} -DBoost_INCLUDE_DIR=${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)