diff options
author | Brad King <brad.king@kitware.com> | 2019-05-28 15:42:38 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2019-05-28 15:43:24 (GMT) |
commit | da78d0f5ea5506602db9f761e559ff9057430c57 (patch) | |
tree | 3ab583630d2cd8e78ffc4591c08533760c47ecfc /Tests | |
parent | 540640fc0aca7f181098b0270fb1cae1cd684791 (diff) | |
parent | 9bf97363b0d0f3ba0bf89247ce4f8811b4286961 (diff) | |
download | CMake-da78d0f5ea5506602db9f761e559ff9057430c57.zip CMake-da78d0f5ea5506602db9f761e559ff9057430c57.tar.gz CMake-da78d0f5ea5506602db9f761e559ff9057430c57.tar.bz2 |
Merge topic 'rel-push'
9bf97363b0 Utilities/Release: Replace upload step with a "push" script
3a0ab3ba23 Utilities/Release: Teach upload script to compute version automatically
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3370
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 698cb1d..6901077 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -770,14 +770,14 @@ if(BUILD_TESTING) file(WRITE "${_TEST_DIR}/nightly-cmake.sh" "cd ${_TEST_DIR} ${CMake_BINARY_DIR}/bin/cmake -DCMAKE_CREATE_VERSION=nightly -P ${CMake_SOURCE_DIR}/Utilities/Release/${script} -${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release/upload_release.cmake +${CMake_SOURCE_DIR}/Utilities/Release/push.bash --dir dev -- '${CMake_BUILD_NIGHTLY_RELEASES}' ") add_test(${name} /bin/sh ${_TEST_DIR}/nightly-cmake.sh) if(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY) set_tests_properties (${name} PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT}) endif() endmacro() - if(CMAKE_BUILD_NIGHTLY_RELEASES) + if(CMake_BUILD_NIGHTLY_RELEASES) ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWin32 win32_release.cmake) ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWin64 |