From 32f79506a6ee94cbdb5da94a2f7d7ebeba795926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Del=20Pino?= <stephane.delpino44@gmail.com> Date: Thu, 5 Sep 2024 19:27:12 +0200 Subject: [PATCH] Clean-up slightly CMakeLists.txt Restore the use of HDF5_PREFER_PARALLEL (TRUE) --- CMakeLists.txt | 1 + tests/CMakeLists.txt | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 51f020ba5..e37052808 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -226,6 +226,7 @@ set(PUGS_ENABLE_HDF5 AUTO CACHE STRING if (PUGS_ENABLE_HDF5 MATCHES "^(AUTO|ON)$") # May be risky. (make to show pugs build options) + set(HDF5_PREFER_PARALLEL TRUE) find_package(HDF5) if (HDF5_FOUND) # HighFive diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 549a9d4e2..26a5dd744 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -302,13 +302,3 @@ target_link_libraries (mpi_unit_tests ${HIGHFIVE_TARGET} stdc++fs ) - -enable_testing() - -if(${PUGS_HAS_MPI}) - set(MPIEXEC_OPTION_FLAGS --oversubscribe) - if (NOT "$ENV{GITLAB_CI}" STREQUAL "") - set(MPIEXEC_OPTION_FLAGS ${MPIEXEC_OPTION_FLAGS} --allow-run-as-root) - endif() - set(OptionalCatchTestLauncher ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 3 ${MPIEXEC_OPTION_FLAGS} --path ${PUGS_BINARY_DIR}) -endif() -- GitLab