diff options
| author | Brad King <brad.king@kitware.com> | 2011-01-11 20:52:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-01-11 20:52:52 (GMT) |
| commit | 7decc70eead665f75872dcf0b95a088d3b307879 (patch) | |
| tree | 8733265f2c0394aef88c5623fdadb74528011fdd | |
| parent | 9a81f0dd0cd45715456b4d298403833b22832cf0 (diff) | |
| parent | faf1c1e49f46fda171541d9f08efaf225457edc5 (diff) | |
| download | CMake-7decc70eead665f75872dcf0b95a088d3b307879.zip CMake-7decc70eead665f75872dcf0b95a088d3b307879.tar.gz CMake-7decc70eead665f75872dcf0b95a088d3b307879.tar.bz2 | |
Merge topic 'build_nightly_from_nightly_branch'
faf1c1e Change the nightly tests to build from the nightly branch and not next.
| -rw-r--r-- | Tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Utilities/Release/release_cmake.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 4109184..c5331be 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -321,7 +321,7 @@ IF(BUILD_TESTING) FILE(MAKE_DIRECTORY "${_TEST_DIR}") FILE(WRITE "${_TEST_DIR}/nightly-cmake.sh" "cd ${_TEST_DIR} -${CMake_BINARY_DIR}/bin/cmake -DCMAKE_CREATE_VERSION=next -P ${CMake_SOURCE_DIR}/Utilities/Release/${script} +${CMake_BINARY_DIR}/bin/cmake -DCMAKE_CREATE_VERSION=nightly -P ${CMake_SOURCE_DIR}/Utilities/Release/${script} ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/Release/upload_release.cmake ") ADD_TEST(${name} /bin/sh ${_TEST_DIR}/nightly-cmake.sh) diff --git a/Utilities/Release/release_cmake.cmake b/Utilities/Release/release_cmake.cmake index 3a35ec3..939d9dc 100644 --- a/Utilities/Release/release_cmake.cmake +++ b/Utilities/Release/release_cmake.cmake @@ -34,7 +34,7 @@ if(NOT DEFINED CVS_COMMAND) set(CVS_COMMAND cvs) endif(NOT DEFINED CVS_COMMAND) -if(${CMAKE_CREATE_VERSION} MATCHES "^(release|maint|next)$") +if(${CMAKE_CREATE_VERSION} MATCHES "^(release|maint|next|nightly)$") set(GIT_BRANCH origin/${CMAKE_CREATE_VERSION}) else() set(GIT_BRANCH ${CMAKE_CREATE_VERSION}) |