diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-03 11:42:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-02-03 11:45:53 (GMT) |
| commit | 9d621ceba115a409ca58e8c59fba365f55fd6d26 (patch) | |
| tree | 50234a073c5b466d02c1281e804a1829c65435e7 /.gitlab | |
| parent | 92459258108c0036808f29f83a8503fea18ccee9 (diff) | |
| download | CMake-9d621ceba115a409ca58e8c59fba365f55fd6d26.zip CMake-9d621ceba115a409ca58e8c59fba365f55fd6d26.tar.gz CMake-9d621ceba115a409ca58e8c59fba365f55fd6d26.tar.bz2 | |
Tests: Run MFC test only when explicitly enabled
Previously we used a complicated heuristic to decide whether or not to
run the MFC test, but it sometimes decided incorrectly to run the test.
Since that was first written, we have developed a convention for other
tests to enable them via undocumented cache entries that are added only
on machines known to meet the tests' requirements. Do that for MFC.
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/configure_windows_vs_common.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_windows_vs_common_ninja.cmake | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab/ci/configure_windows_vs_common.cmake b/.gitlab/ci/configure_windows_vs_common.cmake index 703f534..962f03d 100644 --- a/.gitlab/ci/configure_windows_vs_common.cmake +++ b/.gitlab/ci/configure_windows_vs_common.cmake @@ -5,5 +5,6 @@ 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_Java OFF CACHE BOOL "") +set(CMake_TEST_MFC "ON" 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 ae73f83..1ae1a66 100644 --- a/.gitlab/ci/configure_windows_vs_common_ninja.cmake +++ b/.gitlab/ci/configure_windows_vs_common_ninja.cmake @@ -8,5 +8,6 @@ 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 "") +set(CMake_TEST_MFC "ON" CACHE BOOL "") include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_common.cmake") |