diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-04 13:08:10 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-02-04 13:08:23 (GMT) |
| commit | 3900a31f440a1111f07ea893b146a67778e918c2 (patch) | |
| tree | 85e702e93e22196944cc4ece652228e86bd416e0 /.gitlab | |
| parent | 793c3dcabc1f0c7a5e4d920bd6affc46a47c1afc (diff) | |
| parent | 9d621ceba115a409ca58e8c59fba365f55fd6d26 (diff) | |
| download | CMake-3900a31f440a1111f07ea893b146a67778e918c2.zip CMake-3900a31f440a1111f07ea893b146a67778e918c2.tar.gz CMake-3900a31f440a1111f07ea893b146a67778e918c2.tar.bz2 | |
Merge topic 'test-mfc-explicit' into release-3.23
9d621ceba1 Tests: Run MFC test only when explicitly enabled
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6943
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") |