diff --git a/external/external_build.cmake b/external/external_build.cmake index 8bb063c..ba842be 100644 --- a/external/external_build.cmake +++ b/external/external_build.cmake @@ -35,7 +35,7 @@ IF(INTERNAL_HDF5) ENDIF(INTERNAL_HDF5) IF(INTERNAL_NETCDF) - SET(NETCDF_URL "https://github.com/Unidata/netcdf-c/archive/v4.7.3.tar.gz" CACHE STRING "URL to download NetCDF from") + SET(NETCDF_URL "https://github.com/Unidata/netcdf-c/archive/refs/tags/v4.8.1.tar.gz" CACHE STRING "URL to download NetCDF from") SET(NETCDFCXX_URL "https://github.com/Unidata/netcdf-cxx4/archive/v4.3.1.tar.gz" CACHE STRING "URL to download NetCDF-CXX from") mark_as_advanced(NETCDF_URL) ENDIF(INTERNAL_NETCDF) @@ -151,7 +151,7 @@ if (INTERNAL_NETCDF) SET(EXTRA_NC_FLAGS CPPFLAGS=${CONFIGURE_CPP_FLAGS} LDFLAGS=${CONFIGURE_LD_FLAGS} LIBS=${CONFIGURE_LIBS_FLAGS}) ExternalProject_Add(netcdf DOWNLOAD_DIR ${VIDE_DOWNLOAD_CACHE} - URL_HASH SHA1=a78018c377c843cf7b941c2cdad0190920192179 + URL_HASH SHA256=bc018cc30d5da402622bf76462480664c6668b55eb16ba205a0dfb8647161dd0 DEPENDS ${hdf5_built} PREFIX ${BUILD_PREFIX}/netcdf-prefix URL ${NETCDF_URL} diff --git a/external/external_python_build.cmake b/external/external_python_build.cmake index 17ef42b..d039851 100644 --- a/external/external_python_build.cmake +++ b/external/external_python_build.cmake @@ -1,11 +1,11 @@ INCLUDE(FindPythonInterp) SET(INTERNAL_NETCDF4_PYTHON ON) -SET(INTERNAL_CYTHON ON) -SET(INTERNAL_HEALPY ON) -SET(INTERNAL_SETUPTOOLS ON) -SET(INTERNAL_SCIPY ON) -SET(INTERNAL_KDTREE_SCIPY ON) +SET(INTERNAL_CYTHON OFF) +SET(INTERNAL_HEALPY OFF) +SET(INTERNAL_SETUPTOOLS OFF) +SET(INTERNAL_SCIPY OFF) +SET(INTERNAL_KDTREE_SCIPY OFF) IF (INTERNAL_SETUPTOOLS) execute_process( @@ -32,12 +32,12 @@ IF(INTERNAL_CYTHON) ENDIF(INTERNAL_CYTHON) IF(INTERNAL_NETCDF4_PYTHON) - SET(NETCDF4_PYTHON_URL "https://github.com/Unidata/netcdf4-python/archive/v1.1.9rel.tar.gz" CACHE STRING "URL to download NetCDF4-python from") + SET(NETCDF4_PYTHON_URL "https://github.com/Unidata/netcdf4-python/archive/refs/tags/v1.7.1.post1.tar.gz" CACHE STRING "URL to download NetCDF4-python from") mark_as_advanced(NETCDF4_PYTHON_URL) ENDIF(INTERNAL_NETCDF4_PYTHON) IF (INTERNAL_HEALPY) - SET(HEALPY_URL "http://github.com/healpy/healpy/archive/1.4.1.tar.gz" CACHE STRING "URL to download Healpy from") + SET(HEALPY_URL "http://github.com/healpy/healpy/archive/1.17.3.tar.gz" CACHE STRING "URL to download Healpy from") mark_as_advanced(HEALPY_URL) ENDIF(INTERNAL_HEALPY) @@ -52,7 +52,7 @@ IF(INTERNAL_ARGPARSE) ENDIF(INTERNAL_ARGPARSE) IF(INTERNAL_SCIPY) - SET(SCIPY_URL "https://pypi.python.org/packages/2f/12/565c08132db50a0ba34a33e0901f3d1d4d72e3b432ea828e4d87be5a4991/scipy-0.13.3.tar.gz" CACHE STRING "URL to download scipy from") + SET(SCIPY_URL "https://github.com/scipy/scipy/archive/refs/tags/v1.15.2.tar.gz" CACHE STRING "URL to download scipy from") mark_as_advanced(SCIPY_URL) ENDIF(INTERNAL_SCIPY) @@ -127,6 +127,7 @@ IF(INTERNAL_NETCDF4_PYTHON) ExternalProject_Add(netcdf4-python DEPENDS ${PREV_PYTHON_BUILD} netcdf URL ${NETCDF4_PYTHON_URL} + URL_HASH SHA256=f42dc67e0b5315f889b50114b888d4b2116197dfa61978d965a50ecd94b75f70 PREFIX ${BUILD_PREFIX}/netcdf4-python-prefix CONFIGURE_COMMAND echo "No configure" BUILD_IN_SOURCE 1 @@ -152,6 +153,8 @@ IF(INTERNAL_HEALPY) ExternalProject_Add(healpy DEPENDS cfitsio ${PREV_PYTHON_BUILD} URL ${HEALPY_URL} + GIT_REPOSITORY https://github.com/healpy/healpy/ + GIT_TAG 1.18.0 PREFIX ${BUILD_PREFIX}/healpy-prefix CONFIGURE_COMMAND echo "No configure" BUILD_IN_SOURCE 1 @@ -200,7 +203,7 @@ IF(INTERNAL_SCIPY) ExternalProject_Add(scipy DEPENDS ${PREV_PYTHON_BUILD} URL ${SCIPY_URL} - URL_HASH MD5=0547c1f8e8afad4009cc9b5ef17a2d4d + URL_HASH SHA256=cd58a314d92838f7e6f755c8a2167ead4f27e1fd5c1251fd54289569ef3495ec PREFIX ${BUILD_PREFIX}/scipy-prefix CONFIGURE_COMMAND echo "No configure" BUILD_IN_SOURCE 1