diff options
author | Brad King <brad.king@kitware.com> | 2021-11-12 11:07:21 -0500 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2021-11-12 11:13:00 -0500 |
commit | 94ae6b78725ba9e563d593c90a3f3e900c92a52e (patch) | |
tree | 16516c2c32003a5bd9b5c6069e1419af13bdf99c /.gitlab | |
parent | e731afd8b31260258dc30f2f6f5021e9ac5a865e (diff) | |
download | cmake-94ae6b78725ba9e563d593c90a3f3e900c92a52e.tar.gz |
ci: Enable FindODBC and FindOpenMP tests on Windows VS builds
The packages comes with the Windows SDK and/or the compiler.
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/ci/configure_windows_vs_common.cmake | 5 | ||||
-rw-r--r-- | .gitlab/ci/configure_windows_vs_common_ninja.cmake | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/.gitlab/ci/configure_windows_vs_common.cmake b/.gitlab/ci/configure_windows_vs_common.cmake index f6ece57c88..a0a474242e 100644 --- a/.gitlab/ci/configure_windows_vs_common.cmake +++ b/.gitlab/ci/configure_windows_vs_common.cmake @@ -1,3 +1,8 @@ set(CMake_TEST_WIX_NO_VERIFY "ON" CACHE BOOL "") +set(CMake_TEST_FindODBC "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenMP "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenMP_C "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenMP_CXX "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenMP_Fortran "OFF" CACHE BOOL "") include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_windows_vs_common_ninja.cmake b/.gitlab/ci/configure_windows_vs_common_ninja.cmake index e1ae81e3d3..ae73f8352c 100644 --- a/.gitlab/ci/configure_windows_vs_common_ninja.cmake +++ b/.gitlab/ci/configure_windows_vs_common_ninja.cmake @@ -1,6 +1,11 @@ set(CMake_TEST_WIX_NO_VERIFY "ON" CACHE BOOL "") set(CMake_TEST_GUI "ON" CACHE BOOL "") +set(CMake_TEST_FindODBC "ON" CACHE BOOL "") set(CMake_TEST_FindOpenGL "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenMP "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenMP_C "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenMP_CXX "ON" CACHE BOOL "") +set(CMake_TEST_FindOpenMP_Fortran "OFF" CACHE BOOL "") set(CMake_TEST_IPO_WORKS_C "ON" CACHE BOOL "") set(CMake_TEST_IPO_WORKS_CXX "ON" CACHE BOOL "") |