kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'build_nightly_from_nightly_branch' 

faf1c1e Change the nightly tests to build from the nightly branch and not next.
This commit is contained in:
Brad King 2011-01-11 15:52:52 -05:00 committed by CMake Topic Stage
parent 9a81f0dd0c faf1c1e49f
commit 7decc70eea
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/CMakeLists.txt
View File

@ -321,7 +321,7 @@ IF(BUILD_TESTING)
FILE(MAKE_DIRECTORY "${_TEST_DIR}") FILE(MAKE_DIRECTORY "${_TEST_DIR}")
FILE(WRITE "${_TEST_DIR}/nightly-cmake.sh" FILE(WRITE "${_TEST_DIR}/nightly-cmake.sh"
"cd ${_TEST_DIR} "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 ${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) ADD_TEST(${name} /bin/sh ${_TEST_DIR}/nightly-cmake.sh)

2
Utilities/Release/release_cmake.cmake
View File

@ -34,7 +34,7 @@ if(NOT DEFINED CVS_COMMAND)
set(CVS_COMMAND cvs) set(CVS_COMMAND cvs)
endif(NOT DEFINED CVS_COMMAND) 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}) set(GIT_BRANCH origin/${CMAKE_CREATE_VERSION})
else() else()
set(GIT_BRANCH ${CMAKE_CREATE_VERSION}) set(GIT_BRANCH ${CMAKE_CREATE_VERSION})