From dd98b1db890f0e29d13b13f267b04df2212c4577 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 11 Jan 2023 13:34:17 -0700 Subject: [PATCH] CI: Patch matio cmake files for MPI build --- TPL/matio/mpi.patch | 23 +++++++++++++++++++++++ TPL/matio/runcmake.sh | 9 ++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 TPL/matio/mpi.patch diff --git a/TPL/matio/mpi.patch b/TPL/matio/mpi.patch new file mode 100644 index 0000000000..9b799eeeee --- /dev/null +++ b/TPL/matio/mpi.patch @@ -0,0 +1,23 @@ +From 126ed8b74e5c3118ca46222503d8cf350d8f1cb8 Mon Sep 17 00:00:00 2001 +From: Greg Sjaardema +Date: Wed, 11 Jan 2023 13:27:50 -0700 +Subject: [PATCH] Fix mpi build + +--- + cmake/thirdParties.cmake | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/cmake/thirdParties.cmake b/cmake/thirdParties.cmake +index ae8b4ce..12246ec 100644 +--- a/cmake/thirdParties.cmake ++++ b/cmake/thirdParties.cmake +@@ -1,3 +1,6 @@ ++include(CMakeFindDependencyMacro) ++find_dependency(MPI) ++ + if(MATIO_USE_CONAN AND (MATIO_WITH_HDF5 OR MATIO_WITH_ZLIB)) + conan_add_remote(NAME conan-center URL https://center.conan.io VERIFY_SSL False) + endif() +-- +2.38.1 + diff --git a/TPL/matio/runcmake.sh b/TPL/matio/runcmake.sh index 95e59d2ad9..58b8ce61e7 100755 --- a/TPL/matio/runcmake.sh +++ b/TPL/matio/runcmake.sh @@ -2,7 +2,7 @@ ### The following assumes you are building in a subdirectory of ACCESS Root if [ "X$ACCESS" == "X" ] ; then - ACCESS=$(cd ../../..; pwd) + ACCESS=$(cd ../../../..; pwd) echo "ACCESS set to ${ACCESS}" fi INSTALL_PATH=${INSTALL_PATH:-${ACCESS}} @@ -39,6 +39,13 @@ then LOCAL_ZLIB="-DZLIB_INCLUDE_DIR:PATH=${INSTALL_PATH}/include -DZLIB_LIBRARY:FILEPATH=${INSTALL_PATH}/lib/libz.${LD_EXT}" fi +if [ "$MPI" == "YES" ] +then + cd .. + git am ../mpi.patch + cd - +fi + rm -f config.cache cmake .. -DCMAKE_C_COMPILER:FILEPATH=${CC} \