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

Provide the just-built cython to cosmotool. Forced to reorganize the order of the call to ExternalProject

Browse source
This commit is contained in:
Guilhem Lavaux 2018-07-20 08:48:54 +03:00
parent 63c7757662
commit b5e3086801
5 changed files with 60 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

31
external/external_build.cmake vendored
View file

@ -221,35 +221,6 @@ ELSE(INTERNAL_GSL)
ENDIF(INTERNAL_GSL)
mark_as_advanced(GSL_LIBRARY GSLCBLAS_LIBRARY GSL_INCLUDE_PATH)
##################
# Build CosmoTool
##################
ExternalProject_Add(cosmotool
DEPENDS ${cosmotool_DEPS}
PREFIX ${BUILD_PREFIX}/cosmotool-prefix
SOURCE_DIR ${CMAKE_SOURCE_DIR}/external/cosmotool
CMAKE_ARGS
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DHDF5_DIR=${HDF5_ROOTDIR}
-DHDF5_ROOTDIR=${HDF5_ROOTDIR}
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/ext_build/cosmotool
-DNETCDF_INCLUDE_PATH=${NETCDF_INCLUDE_PATH}
-DNETCDFCPP_INCLUDE_PATH=${NETCDFCPP_INCLUDE_PATH}
-DGSL_INCLUDE_PATH=${GSL_INCLUDE_PATH}
-DGSL_LIBRARY=${GSL_LIBRARY}
-DGSLCBLAS_LIBRARY=${GSLCBLAS_LIBRARY}
-DNETCDF_LIBRARY=${NETCDF_LIBRARY}
-DNETCDFCPP_LIBRARY=${NETCDFCPP_LIBRARY}
-DENABLE_SHARP=OFF
-DBoost_INCLUDE_DIR=${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)
#################
# Build cfitsio
#################
@ -361,6 +332,6 @@ ENDIF(SDF_SUPPORT)
include_directories(${CMAKE_BINARY_DIR}/src
${NETCDF_INCLUDE_PATH} ${GSL_INCLUDE_PATH}
${HDF5_INCLUDE_PATH} ${COSMOTOOL_INCLUDE_PATH}
${HDF5_INCLUDE_PATH}
${Boost_INCLUDE_DIRS}
${QHULL_INCLUDE_PATH} ${LIBSDF_INCLUDE_PATH})