diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-13 12:14:56 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-07-13 12:15:07 (GMT) |
| commit | 9b12ffc1e8b1007e2e9c696ce0fa5640d225c92b (patch) | |
| tree | 516a5aca789cddd7749f29f8171adfd490ce3e8d /.gitlab | |
| parent | 15bd593f4f620f185ffb2f733071c2de1f9dcd9e (diff) | |
| parent | 31ac4b916525126c5d7f3a944a749b8989a456c5 (diff) | |
| download | CMake-9b12ffc1e8b1007e2e9c696ce0fa5640d225c92b.zip CMake-9b12ffc1e8b1007e2e9c696ce0fa5640d225c92b.tar.gz CMake-9b12ffc1e8b1007e2e9c696ce0fa5640d225c92b.tar.bz2 | |
Merge topic 'FindBLAS-LAPACK-All'
31ac4b9165 ci: Verify that Intel MKL is found when it is the only BLAS/LAPACK
57dcde19da Find{BLAS,LAPACK}: Avoid clobbering results when no vendor is requested
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6336
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/configure_intelcompiler_common.cmake | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/.gitlab/ci/configure_intelcompiler_common.cmake b/.gitlab/ci/configure_intelcompiler_common.cmake index df3a696..be175e4 100644 --- a/.gitlab/ci/configure_intelcompiler_common.cmake +++ b/.gitlab/ci/configure_intelcompiler_common.cmake @@ -1,6 +1,10 @@ -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 "") +set(CMake_TEST_FindBLAS "All;Intel10_64lp;Intel10_64lp.gcc" CACHE STRING "") +set(CMake_TEST_FindBLAS_All "Intel10_64lp" CACHE STRING "") +set(CMake_TEST_FindBLAS_STATIC "All;Intel10_64lp;Intel10_64lp.gcc" CACHE STRING "") +set(CMake_TEST_FindBLAS_STATIC_All "Intel10_64lp" CACHE STRING "") +set(CMake_TEST_FindLAPACK "All;Intel10_64lp;Intel10_64lp.gcc" CACHE STRING "") +set(CMake_TEST_FindLAPACK_All "Intel10_64lp" CACHE STRING "") +set(CMake_TEST_FindLAPACK_STATIC "All;Intel10_64lp;Intel10_64lp.gcc" CACHE STRING "") +set(CMake_TEST_FindLAPACK_STATIC_All "Intel10_64lp" CACHE STRING "") include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") |