diff options
author | Brad King <brad.king@kitware.com> | 2020-05-25 15:09:53 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-25 15:10:06 (GMT) |
commit | 3ed8b663a9fd6e8d6f7ec0571ab1e3530f9156db (patch) | |
tree | 0a8b030dd26e121451aceca82e8ddef8439a81ae /Tests/CMakeLists.txt | |
parent | a354b7f21e858728606ddc7c275bad35914d8eaa (diff) | |
parent | b566f0b30817270c89fc64bb11fade61bd08d0c0 (diff) | |
download | CMake-3ed8b663a9fd6e8d6f7ec0571ab1e3530f9156db.zip CMake-3ed8b663a9fd6e8d6f7ec0571ab1e3530f9156db.tar.gz CMake-3ed8b663a9fd6e8d6f7ec0571ab1e3530f9156db.tar.bz2 |
Merge topic 'gitlab-ci-regular-builders'
b566f0b308 gitlab-ci: add windows builder
5b564c371e gitlab-ci: add Windows infrastructure
809f9a9916 gitlab: add powershell scripts for utilities
02c56b71a1 gitlab-ci: add a macos builder
a1b1fc611b gitlab-ci: add Linux makefiles and ninja builders
3e1a1ba92d ci: add dependencies for the test suite to the Fedora image
d5438f783a ci: add make to the CI image
0ed7e424ab gitlab-ci: use the cmake_build_unix anchor
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4723
Diffstat (limited to 'Tests/CMakeLists.txt')
-rw-r--r-- | Tests/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 0c8a639..d7e567c 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -978,6 +978,7 @@ ${CMake_SOURCE_DIR}/Utilities/Release/push.bash --dir dev -- '${CMake_BUILD_NIGH --build-options --test-command ${CMAKE_CMAKE_COMMAND} "-DCPackWiXGenerator_BINARY_DIR:PATH=${CMake_BINARY_DIR}/Tests/CPackWiXGenerator" + "-Dno_verify:BOOL=${CMake_TEST_WIX_NO_VERIFY}" "-Dconfig=\${CTEST_CONFIGURATION_TYPE}" -P "${CMake_SOURCE_DIR}/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake") |