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

fix: upgrade dependencies path and configuration

Browse source
This commit is contained in:
Guilhem Lavaux 2025-07-02 13:53:48 +02:00
parent 54d71a9a0d
commit b68bc67451
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
external/external_build.cmake vendored
View file

@ -158,6 +158,7 @@ if (INTERNAL_NETCDF)
-DCMAKE_INSTALL_PREFIX=${EXT_INSTALL}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_INSTALL_LIBDIR=lib
-DBUILD_SHARED_LIBS=OFF
-DBUILD_TESTING=OFF
-DBUILD_TESTSETS=OFF
@ -170,6 +171,7 @@ if (INTERNAL_NETCDF)
-DNETCDF_ENABLE_EXAMPLES=OFF
-DNETCDF_ENABLE_TESTS=OFF
-DNETCDF_ENABLE_LOGGING=ON
BUILD_BYPRODUCTS ${EXT_INSTALL}/lib/libnetcdf.a
#PATCH_COMMAND ${CMAKE_COMMAND}
# -DBUILD_PREFIX=${BUILD_PREFIX}/netcdf-prefix
# -DPATCH_FILE=${CMAKE_SOURCE_DIR}/external/patch_netcdf
@ -197,7 +199,8 @@ if (INTERNAL_NETCDF)
-DBUILD_SHARED_LIBS=OFF
-DBUILD_TESTING=OFF
-DBUILD_TESTSET=OFF
BUILD_BYPRODUCTS ${EXT_INSTALL}/lib/libnetcdf_c++4.a
-DCMAKE_INSTALL_LIBDIR=lib
BUILD_BYPRODUCTS ${EXT_INSTALL}/lib/libnetcdf-cxx4.a
# CONFIGURE_COMMAND env PATH=${EXT_INSTALL}/bin:$ENV{PATH} ${NETCDF_CXX_SOURCE_DIR}/configure
# --prefix=${NETCDF_BIN_DIR} --libdir=${NETCDF_BIN_DIR}/lib
# --with-pic --disable-shared
@ -211,7 +214,7 @@ if (INTERNAL_NETCDF)
SET(EXTRA_NC_FLAGS CPPFLAGS=${CONFIGURE_CPP_FLAGS} LDFLAGS=${CONFIGURE_CPP_LDFLAGS})
SET(cosmotool_DEPS ${cosmotool_DEPS} netcdf netcdf_cxx)
SET(NETCDF_LIBRARY ${NETCDF_BIN_DIR}/lib/libnetcdf.a CACHE STRING "NetCDF lib" FORCE)
SET(NETCDFCPP_LIBRARY ${NETCDF_BIN_DIR}/lib/libnetcdf_c++4.a CACHE STRING "NetCDF-C++ lib" FORCE)
SET(NETCDFCPP_LIBRARY ${NETCDF_BIN_DIR}/lib/libnetcdf-cxx4.a CACHE STRING "NetCDF-C++ lib" FORCE)
SET(NETCDF_INCLUDE_PATH ${NETCDF_BIN_DIR}/include CACHE STRING "NetCDF include" FORCE)
SET(NETCDFCPP_INCLUDE_PATH ${NETCDF_INCLUDE_PATH} CACHE STRING "NetCDF C++ include path" FORCE)
@ -363,7 +366,7 @@ ExternalProject_Add(healpix
set(HPIX_LIBPATH ${HEALPIX_DIR}/lib) # ${EXT_INSTALL}/lib)
set(HEALPIX_LIBRARY ${HPIX_LIBPATH}/libhealpix_cxx.a)
SET(HEALPIX_INCLUDE_PATH ${HEALPIX_DIR}/include) # ${EXT_INSTALL}/include/healpix_cxx)
SET(HEALPIX_INCLUDE_PATH ${HEALPIX_DIR}/include ${HEALPIX_DIR}/include/healpix_cxx) # ${EXT_INSTALL}/include/healpix_cxx)
SET(HEALPIX_LIBRARIES ${HEALPIX_LIBRARY} ${CFITSIO_LIBRARY} )
set(GSL_LIBRARIES ${GSL_LIBRARY} ${GSL_CBLAS_LIBRARY})
SET(NETCDF_LIBRARIES ${NETCDFCPP_LIBRARY} ${NETCDF_LIBRARY} ${HDF5_HL_LIBRARIES} ${HDF5_LIBRARIES} ${ZLIB_LIBRARY})