diff options
author | Ben Boeckel <ben.boeckel@kitware.com> | 2020-05-26 13:19:31 (GMT) |
---|---|---|
committer | Ben Boeckel <ben.boeckel@kitware.com> | 2020-05-26 16:50:16 (GMT) |
commit | 9812e87ee44b758f82f4612950ffa03df934e90a (patch) | |
tree | 56551bbd097bcc7edeec84a93ed3b2668d554c70 /.gitlab | |
parent | e63fe4a58863e4a8fe6cee55e6ffd4324f5e10d4 (diff) | |
download | CMake-9812e87ee44b758f82f4612950ffa03df934e90a.zip CMake-9812e87ee44b758f82f4612950ffa03df934e90a.tar.gz CMake-9812e87ee44b758f82f4612950ffa03df934e90a.tar.bz2 |
gitlab-ci: add a test of the VS generator based off of the ninja build
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/ci/configure_windows_vs2019_x64.cmake | 3 | ||||
-rw-r--r-- | .gitlab/ci/ctest_exclusions.cmake | 9 |
2 files changed, 12 insertions, 0 deletions
diff --git a/.gitlab/ci/configure_windows_vs2019_x64.cmake b/.gitlab/ci/configure_windows_vs2019_x64.cmake new file mode 100644 index 0000000..f6ece57 --- /dev/null +++ b/.gitlab/ci/configure_windows_vs2019_x64.cmake @@ -0,0 +1,3 @@ +set(CMake_TEST_WIX_NO_VERIFY "ON" CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/ctest_exclusions.cmake b/.gitlab/ci/ctest_exclusions.cmake index d8980f6..eb9b724 100644 --- a/.gitlab/ci/ctest_exclusions.cmake +++ b/.gitlab/ci/ctest_exclusions.cmake @@ -1,6 +1,15 @@ set(test_exclusions ) +if (CTEST_CMAKE_GENERATOR MATCHES "Visual Studio") + list(APPEND test_exclusions + # This test takes around 5 minutes with Visual Studio. + # https://gitlab.kitware.com/cmake/cmake/-/issues/20733 + "^ExternalProjectUpdate$" + # This test is a dependency of the above and is only required for it. + "^ExternalProjectUpdateSetup$") +endif () + string(REPLACE ";" "|" test_exclusions "${test_exclusions}") if (test_exclusions) set(test_exclusions "(${test_exclusions})") |