summaryrefslogtreecommitdiffstats
path: root/.gitlab
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-06-11 10:05:44 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-06-11 10:05:54 (GMT)
commit4217e1cf3a47a2702e07dbf38cce43d6650e497b (patch)
tree06cc61b209547b0efc6ad8a343332a7bb7384a71 /.gitlab
parent42ca81ce423a16aa22cbbe314f39abb65de79961 (diff)
parentdaa0a1f877c410f5ee59e9860d9cba86e1475152 (diff)
downloadCMake-4217e1cf3a47a2702e07dbf38cce43d6650e497b.zip
CMake-4217e1cf3a47a2702e07dbf38cce43d6650e497b.tar.gz
CMake-4217e1cf3a47a2702e07dbf38cce43d6650e497b.tar.bz2
Merge topic 'FindBLAS-mkl-gnu'
daa0a1f877 Find{BLAS,LAPACK}: Add tests covering Intel MKL with GNU compiler 624110b90d FindBLAS: Revert "Do not statically link against iomp5 ... Intel MKL" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6213
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/configure_intelcompiler_common.cmake8
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab/ci/configure_intelcompiler_common.cmake b/.gitlab/ci/configure_intelcompiler_common.cmake
index 79f657b..df3a696 100644
--- a/.gitlab/ci/configure_intelcompiler_common.cmake
+++ b/.gitlab/ci/configure_intelcompiler_common.cmake
@@ -1,6 +1,6 @@
-set(CMake_TEST_FindBLAS "Intel10_64lp" CACHE STRING "")
-set(CMake_TEST_FindBLAS_STATIC "Intel10_64lp" CACHE STRING "")
-set(CMake_TEST_FindLAPACK "Intel10_64lp" CACHE STRING "")
-set(CMake_TEST_FindLAPACK_STATIC "Intel10_64lp" CACHE STRING "")
+set(CMake_TEST_FindBLAS "Intel10_64lp;Intel10_64lp.gcc" CACHE STRING "")
+set(CMake_TEST_FindBLAS_STATIC "Intel10_64lp;Intel10_64lp.gcc" CACHE STRING "")
+set(CMake_TEST_FindLAPACK "Intel10_64lp;Intel10_64lp.gcc" CACHE STRING "")
+set(CMake_TEST_FindLAPACK_STATIC "Intel10_64lp;Intel10_64lp.gcc" CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")