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

2 files changed, 44 insertions, 16 deletions

diff --git a/Tests/FindBLAS/CMakeLists.txt b/Tests/FindBLAS/CMakeLists.txt
index 63ef1dd..31c701e 100644
--- a/Tests/FindBLAS/CMakeLists.txt
+++ b/Tests/FindBLAS/CMakeLists.txt
@@ -1,25 +1,39 @@
-foreach(vendor IN LISTS CMake_TEST_FindBLAS)
-  add_test(NAME FindBLAS.Test_${vendor} COMMAND
+foreach(variant IN LISTS CMake_TEST_FindBLAS)
+  if(variant MATCHES "^([^.]+)\\.(.*)$")
+    set(vendor "${CMAKE_MATCH_1}")
+    set(alt_compiler "-DCMAKE_C_COMPILER=${CMAKE_MATCH_2}")
+  else()
+    set(vendor "${variant}")
+    set(alt_compiler "")
+  endif()
+  add_test(NAME FindBLAS.Test_${variant} COMMAND
     ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>
     --build-and-test
     "${CMake_SOURCE_DIR}/Tests/FindBLAS/Test"
-    "${CMake_BINARY_DIR}/Tests/FindBLAS/Test_${vendor}"
+    "${CMake_BINARY_DIR}/Tests/FindBLAS/Test_${variant}"
     ${build_generator_args}
     --build-project TestFindBLAS
-    --build-options ${build_options} -DBLA_VENDOR=${vendor}
+    --build-options ${build_options} ${alt_compiler} -DBLA_VENDOR=${vendor}
     --test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION>
     )
 endforeach()
 
-foreach(vendor IN LISTS CMake_TEST_FindBLAS_STATIC)
-  add_test(NAME FindBLAS.Test_${vendor}_Static COMMAND
+foreach(variant IN LISTS CMake_TEST_FindBLAS_STATIC)
+  if(variant MATCHES "^([^.]+)\\.(.*)$")
+    set(vendor "${CMAKE_MATCH_1}")
+    set(alt_compiler "-DCMAKE_C_COMPILER=${CMAKE_MATCH_2}")
+  else()
+    set(vendor "${variant}")
+    set(alt_compiler "")
+  endif()
+  add_test(NAME FindBLAS.Test_${variant}_Static COMMAND
     ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>
     --build-and-test
     "${CMake_SOURCE_DIR}/Tests/FindBLAS/Test"
-    "${CMake_BINARY_DIR}/Tests/FindBLAS/Test_${vendor}_Static"
+    "${CMake_BINARY_DIR}/Tests/FindBLAS/Test_${variant}_Static"
     ${build_generator_args}
     --build-project TestFindBLAS
-    --build-options ${build_options} -DBLA_VENDOR=${vendor} -DBLA_STATIC=ON
+    --build-options ${build_options} ${alt_compiler} -DBLA_VENDOR=${vendor} -DBLA_STATIC=ON
     --test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION>
     )
 endforeach()
diff --git a/Tests/FindLAPACK/CMakeLists.txt b/Tests/FindLAPACK/CMakeLists.txt
index eab5bb4..26cfa87 100644
--- a/Tests/FindLAPACK/CMakeLists.txt
+++ b/Tests/FindLAPACK/CMakeLists.txt
@@ -1,25 +1,39 @@
-foreach(vendor IN LISTS CMake_TEST_FindLAPACK)
-  add_test(NAME FindLAPACK.Test_${vendor} COMMAND
+foreach(variant IN LISTS CMake_TEST_FindLAPACK)
+  if(variant MATCHES "^([^.]+)\\.(.*)$")
+    set(vendor "${CMAKE_MATCH_1}")
+    set(alt_compiler "-DCMAKE_C_COMPILER=${CMAKE_MATCH_2}")
+  else()
+    set(vendor "${variant}")
+    set(alt_compiler "")
+  endif()
+  add_test(NAME FindLAPACK.Test_${variant} COMMAND
     ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>
     --build-and-test
     "${CMake_SOURCE_DIR}/Tests/FindLAPACK/Test"
-    "${CMake_BINARY_DIR}/Tests/FindLAPACK/Test_${vendor}"
+    "${CMake_BINARY_DIR}/Tests/FindLAPACK/Test_${variant}"
     ${build_generator_args}
     --build-project TestFindLAPACK
-    --build-options ${build_options} -DBLA_VENDOR=${vendor}
+    --build-options ${build_options} ${alt_compiler} -DBLA_VENDOR=${vendor}
     --test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION>
     )
 endforeach()
 
-foreach(vendor IN LISTS CMake_TEST_FindLAPACK_STATIC)
-  add_test(NAME FindLAPACK.Test_${vendor}_Static COMMAND
+foreach(variant IN LISTS CMake_TEST_FindLAPACK_STATIC)
+  if(variant MATCHES "^([^.]+)\\.(.*)$")
+    set(vendor "${CMAKE_MATCH_1}")
+    set(alt_compiler "-DCMAKE_C_COMPILER=${CMAKE_MATCH_2}")
+  else()
+    set(vendor "${variant}")
+    set(alt_compiler "")
+  endif()
+  add_test(NAME FindLAPACK.Test_${variant}_Static COMMAND
     ${CMAKE_CTEST_COMMAND} -C $<CONFIGURATION>
     --build-and-test
     "${CMake_SOURCE_DIR}/Tests/FindLAPACK/Test"
-    "${CMake_BINARY_DIR}/Tests/FindLAPACK/Test_${vendor}_Static"
+    "${CMake_BINARY_DIR}/Tests/FindLAPACK/Test_${variant}_Static"
     ${build_generator_args}
     --build-project TestFindLAPACK
-    --build-options ${build_options} -DBLA_VENDOR=${vendor} -DBLA_STATIC=ON
+    --build-options ${build_options} ${alt_compiler} -DBLA_VENDOR=${vendor} -DBLA_STATIC=ON
     --test-command ${CMAKE_CTEST_COMMAND} -V -C $<CONFIGURATION>
     )
 endforeach()