mirror of
https://bitbucket.org/cosmicvoids/vide_public.git
synced 2025-07-08 17:21:12 +00:00
fix: update dependencies and fix path detection of cfitsio
This commit is contained in:
parent
3d6a35f3ed
commit
d6d6ac4761
2 changed files with 3 additions and 2 deletions
3
external/external_build.cmake
vendored
3
external/external_build.cmake
vendored
|
@ -351,7 +351,7 @@ ExternalProject_Add(healpix
|
||||||
PREFIX ${BUILD_PREFIX}/healpix-prefix
|
PREFIX ${BUILD_PREFIX}/healpix-prefix
|
||||||
URL ${HEALPIX_URL}
|
URL ${HEALPIX_URL}
|
||||||
URL_HASH SHA256=8876c18efc596fd706b2a004ac15f2fb60b795f2db6fbabea9d8ccf549531dda
|
URL_HASH SHA256=8876c18efc596fd706b2a004ac15f2fb60b795f2db6fbabea9d8ccf549531dda
|
||||||
CONFIGURE_COMMAND ./configure --auto=cxx
|
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env FITSDIR=${EXT_INSTALL}/lib FITSINC=${EXT_INSTALL}/include ./configure --auto=cxx
|
||||||
BUILD_IN_SOURCE 1
|
BUILD_IN_SOURCE 1
|
||||||
BUILD_BYPRODUCTS ${HEALPIX_DIR}/lib/libhealpix_cxx.a
|
BUILD_BYPRODUCTS ${HEALPIX_DIR}/lib/libhealpix_cxx.a
|
||||||
INSTALL_COMMAND true
|
INSTALL_COMMAND true
|
||||||
|
@ -383,6 +383,7 @@ if (INTERNAL_QHULL)
|
||||||
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/ext_build/qhull
|
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/ext_build/qhull
|
||||||
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
|
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
|
||||||
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
|
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
|
||||||
|
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
|
||||||
|
|
||||||
)
|
)
|
||||||
SET(QHULL_DIR ${CMAKE_BINARY_DIR}/ext_build/qhull)
|
SET(QHULL_DIR ${CMAKE_BINARY_DIR}/ext_build/qhull)
|
||||||
|
|
2
external/external_cosmotool.cmake
vendored
2
external/external_cosmotool.cmake
vendored
|
@ -10,7 +10,7 @@ ENDIF()
|
||||||
|
|
||||||
#v1.0.0a7.tar.bz2
|
#v1.0.0a7.tar.bz2
|
||||||
ExternalProject_Add(cosmotool
|
ExternalProject_Add(cosmotool
|
||||||
URL https://git.aquila-consortium.org/guilhem_lavaux/cosmotool/archive/63158017ea7b693cf2b8b2f840e24fb1f6882558.tar.gz
|
URL https://git.aquila-consortium.org/guilhem_lavaux/cosmotool/archive/ee8f4c3135c0ae8e4a421df8dd3ea832d8724542.tar.gz
|
||||||
DEPENDS ${cosmotool_DEPS}
|
DEPENDS ${cosmotool_DEPS}
|
||||||
SOURCE_DIR ${COSMOTOOL_DIR}
|
SOURCE_DIR ${COSMOTOOL_DIR}
|
||||||
PREFIX ${BUILD_PREFIX}/cosmotool-prefix
|
PREFIX ${BUILD_PREFIX}/cosmotool-prefix
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue