diff --git a/geogram/CMakeLists.txt b/geogram/CMakeLists.txt index a6f95a99..3a91f47f 100644 --- a/geogram/CMakeLists.txt +++ b/geogram/CMakeLists.txt @@ -14,7 +14,8 @@ if (ENABLE_GEOGRAM) ExternalProject_Add(GEOGRAM_BLD URL "${CMAKE_CURRENT_SOURCE_DIR}/geogram" BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS} - PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/geogram.patch + PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/geogram_cmake.patch + COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/geogram_superlu.patch CMAKE_ARGS ${BUILD_TYPE_SPECIFIER} -DBIN_DIR=${BIN_DIR} diff --git a/geogram/geogram.patch b/geogram/geogram_cmake.patch similarity index 100% rename from geogram/geogram.patch rename to geogram/geogram_cmake.patch diff --git a/geogram/geogram_superlu.patch b/geogram/geogram_superlu.patch new file mode 100644 index 00000000..e1257112 --- /dev/null +++ b/geogram/geogram_superlu.patch @@ -0,0 +1,48 @@ +diff -Naur geogram/src/lib/third_party/numerics/SUPERLU/cutil.c GEOGRAM_BLD/src/lib/third_party/numerics/SUPERLU/cutil.c +--- geogram/src/lib/third_party/numerics/SUPERLU/cutil.c 2024-04-19 17:13:22.947629009 -0400 ++++ GEOGRAM_BLD/src/lib/third_party/numerics/SUPERLU/cutil.c 2024-04-19 17:13:53.726931559 -0400 +@@ -474,7 +474,7 @@ + + + +- ++int + print_complex_vec(char *what, int n, complex *vec) + { + int i; +diff -Naur geogram/src/lib/third_party/numerics/SUPERLU/dutil.c GEOGRAM_BLD/src/lib/third_party/numerics/SUPERLU/dutil.c +--- geogram/src/lib/third_party/numerics/SUPERLU/dutil.c 2024-04-19 17:13:22.947629009 -0400 ++++ GEOGRAM_BLD/src/lib/third_party/numerics/SUPERLU/dutil.c 2024-04-19 17:13:59.518801347 -0400 +@@ -470,7 +470,7 @@ + + + +- ++int + print_double_vec(char *what, int n, double *vec) + { + int i; +diff -Naur geogram/src/lib/third_party/numerics/SUPERLU/sutil.c GEOGRAM_BLD/src/lib/third_party/numerics/SUPERLU/sutil.c +--- geogram/src/lib/third_party/numerics/SUPERLU/sutil.c 2024-04-19 17:13:22.947629009 -0400 ++++ GEOGRAM_BLD/src/lib/third_party/numerics/SUPERLU/sutil.c 2024-04-19 17:14:20.190339229 -0400 +@@ -470,7 +470,7 @@ + + + +- ++int + print_float_vec(char *what, int n, float *vec) + { + int i; +diff -Naur geogram/src/lib/third_party/numerics/SUPERLU/zutil.c GEOGRAM_BLD/src/lib/third_party/numerics/SUPERLU/zutil.c +--- geogram/src/lib/third_party/numerics/SUPERLU/zutil.c 2024-04-19 17:13:22.947629009 -0400 ++++ GEOGRAM_BLD/src/lib/third_party/numerics/SUPERLU/zutil.c 2024-04-19 17:14:27.294181312 -0400 +@@ -474,7 +474,7 @@ + + + +- ++int + print_doublecomplex_vec(char *what, int n, doublecomplex *vec) + { + int i;