CHG: Added packages to UB CCR installation; do not compile MeshPartit…

…ion if METIS is not available
ISSMteam · Jul 18, 2024 · 787af96 · 787af96
1 parent 4dc2ae2
commit 787af96
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 1 deletion.
diff --git a/externalpackages/gdal/install-3-python-static.sh b/externalpackages/gdal/install-3-python-static.sh
@@ -41,6 +41,8 @@ cmake \
 	-DBUILD_SHARED_LIBS=OFF \
 	-DBUILD_PYTHON_BINDINGS=ON \
 	-DGDAL_SET_INSTALL_RELATIVE_RPATH=ON \
+	-DGDAL_USE_ARCHIVE=OFF \
+	-DGDAL_USE_CRYPTOPP=OFF \
 	-DCURL_INCLUDE_DIR="${CURL_ROOT}/include" \
 	-DCURL_LIBRARY_RELEASE="${CURL_ROOT}/lib/libcurl.a" \
 	-DCURL_USE_STATIC_LIBS=ON \

diff --git a/externalpackages/gdal/install-3-python.sh b/externalpackages/gdal/install-3-python.sh
@@ -42,6 +42,8 @@ cmake \
 	-DBUILD_PYTHON_BINDINGS=ON \
 	-DGDAL_PYTHON_INSTALL_PREFIX="${PREFIX}" \
 	-DGDAL_SET_INSTALL_RELATIVE_RPATH=ON \
+	-DGDAL_USE_ARCHIVE=OFF \
+	-DGDAL_USE_CRYPTOPP=OFF \
 	-DCURL_DIR="${CURL_ROOT}" \
 	-DGDAL_USE_JPEG_INTERNAL=ON \
 	-DGDAL_USE_JPEG12_INTERNAL=ON \

diff --git a/externalpackages/gdal/install-3-static.sh b/externalpackages/gdal/install-3-static.sh
@@ -41,6 +41,8 @@ cmake \
 	-DBUILD_SHARED_LIBS=OFF \
 	-DBUILD_PYTHON_BINDINGS=OFF \
 	-DGDAL_SET_INSTALL_RELATIVE_RPATH=ON \
+	-DGDAL_USE_ARCHIVE=OFF \
+	-DGDAL_USE_CRYPTOPP=OFF \
 	-DCURL_INCLUDE_DIR="${CURL_ROOT}/include" \
 	-DCURL_LIBRARY_RELEASE="${CURL_ROOT}/lib/libcurl.a" \
 	-DCURL_USE_STATIC_LIBS=ON \

diff --git a/externalpackages/gdal/install-3.sh b/externalpackages/gdal/install-3.sh
@@ -42,6 +42,8 @@ cmake \
 	-DBUILD_PYTHON_BINDINGS=OFF \
 	-DGDAL_PYTHON_INSTALL_PREFIX="${PREFIX}" \
 	-DGDAL_SET_INSTALL_RELATIVE_RPATH=ON \
+	-DGDAL_USE_ARCHIVE=OFF \
+	-DGDAL_USE_CRYPTOPP=OFF \
 	-DCURL_DIR="${CURL_ROOT}" \
 	-DGDAL_USE_JPEG_INTERNAL=ON \
 	-DGDAL_USE_JPEG12_INTERNAL=ON \

diff --git a/jenkins/ub-ccr b/jenkins/ub-ccr
@@ -17,7 +17,9 @@ ISSM_CONFIG='\
 	--with-parmetis-dir="${ISSM_DIR}/externalpackages/petsc/install" \
 	--with-scalapack-dir="${ISSM_DIR}/externalpackages/petsc/install" \
 	--with-mumps-dir="${ISSM_DIR}/externalpackages/petsc/install" \
+	--with-hdf5-dir="${ISSM_DIR}/externalpackages/hdf5/install" \
 	--with-petsc-dir="${ISSM_DIR}/externalpackages/petsc/install" \
+	--with-proj-dir="${ISSM_DIR}/externalpackages/proj/install" \
 	--with-triangle-dir="${ISSM_DIR}/externalpackages/triangle/install" \
 	--with-m1qn3-dir="${ISSM_DIR}/externalpackages/m1qn3/install" \
 	--with-semic-dir="${ISSM_DIR}/externalpackages/semic/install" \
@@ -29,6 +31,11 @@ ISSM_CONFIG='\
 
 EXTERNALPACKAGES="
 	petsc			install-3.21-linux.sh
+	curl			install-7-linux.sh
+	hdf5			install-1.sh
+	netcdf			install-4.sh
+	proj			install-6.sh
+	gdal			install-3-python.sh
 	triangle		install-linux.sh
 	m1qn3			install-linux.sh
 	semic			install.sh

diff --git a/src/c/Makefile.am b/src/c/Makefile.am
@@ -332,7 +332,6 @@ issm_sources += \
 	./modules/ModelProcessorx/CreateOutputDefinitions.cpp \
 	./modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.cpp \
 	./modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp \
-	./modules/MeshPartitionx/MeshPartitionx.cpp \
 	./classes/Inputs/Inputs.cpp \
 	./classes/Inputs/BoolInput.cpp \
 	./classes/Inputs/DoubleInput.cpp \
@@ -589,6 +588,7 @@ endif
 #}}}
 # METIS sources {{{
 if METIS
+issm_sources += ./modules/MeshPartitionx/MeshPartitionx.cpp
 issm_sources += ./toolkits/metis/patches/METIS_PartMeshNodalPatch.cpp
 endif
 #}}}