summaryrefslogtreecommitdiffstats
path: root/.gitlab
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-03-29 20:33:54 (GMT)
committerBrad King <brad.king@kitware.com>2023-03-29 21:18:30 (GMT)
commit0e87e6c1a40f8b5cce76599840c7aac23e183ac3 (patch)
tree0cad00d85c494746bec5301d1cecf69295667aea /.gitlab
parentee075a53c883775e8753e0fe6ba240eba9dcaae6 (diff)
downloadCMake-0e87e6c1a40f8b5cce76599840c7aac23e183ac3.zip
CMake-0e87e6c1a40f8b5cce76599840c7aac23e183ac3.tar.gz
CMake-0e87e6c1a40f8b5cce76599840c7aac23e183ac3.tar.bz2
Tests: Add FindMPI test environment modification option
Provide a way to configure an environment specific to this test. Avoid setting the environment globally for it in CI jobs.
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/configure_fedora37_makefiles.cmake1
-rw-r--r--.gitlab/ci/env_fedora37_makefiles.cmake1
2 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab/ci/configure_fedora37_makefiles.cmake b/.gitlab/ci/configure_fedora37_makefiles.cmake
index f5676aa..2950eaa 100644
--- a/.gitlab/ci/configure_fedora37_makefiles.cmake
+++ b/.gitlab/ci/configure_fedora37_makefiles.cmake
@@ -45,6 +45,7 @@ set(CMake_TEST_FindLibXslt "ON" CACHE BOOL "")
set(CMake_TEST_FindMPI_C "ON" CACHE BOOL "")
set(CMake_TEST_FindMPI_CXX "ON" CACHE BOOL "")
set(CMake_TEST_FindMPI_Fortran "ON" CACHE BOOL "")
+set(CMake_TEST_FindMPI_ENVMOD "PATH=path_list_prepend:/usr/lib64/mpich/bin;LD_LIBRARY_PATH=path_list_prepend:/usr/lib64/mpich/lib" CACHE STRING "")
set(CMake_TEST_FindMPI "ON" CACHE BOOL "")
set(CMake_TEST_FindODBC "ON" CACHE BOOL "")
set(CMake_TEST_FindOpenACC "ON" CACHE BOOL "")
diff --git a/.gitlab/ci/env_fedora37_makefiles.cmake b/.gitlab/ci/env_fedora37_makefiles.cmake
index 2bcb6d0..ef13cda 100644
--- a/.gitlab/ci/env_fedora37_makefiles.cmake
+++ b/.gitlab/ci/env_fedora37_makefiles.cmake
@@ -1,2 +1 @@
set(ENV{MY_RUBY_HOME} "/usr/local/rvm/rubies/ruby-3.0.4")
-set(ENV{PATH} "/usr/lib64/mpich/bin:$ENV{PATH}")