diff options
| author | Brad King <brad.king@kitware.com> | 2010-09-21 14:32:42 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-09-21 14:32:42 (GMT) |
| commit | 39d99c24583574c542e1cd74b8a92a5c21d3454d (patch) | |
| tree | 696afe63405de4e63acf309ab78a3c7d24dbc063 /Utilities/Release/release_cmake.cmake | |
| parent | 753cbf83568492c159c21baeffb9fbea5c661e91 (diff) | |
| parent | 4a67481ed6045e8aebb2b5e169fcb55c953432be (diff) | |
| download | CMake-39d99c24583574c542e1cd74b8a92a5c21d3454d.zip CMake-39d99c24583574c542e1cd74b8a92a5c21d3454d.tar.gz CMake-39d99c24583574c542e1cd74b8a92a5c21d3454d.tar.bz2 | |
Merge topic 'fix_release_tags'
4a67481 Update release scripts.
7d148d8 Fix the name of the variable being tested.
297be5b add next as an orgin based branch, and not a tag.
187976b Fix release scripts to be able to build releases from tags.
Diffstat (limited to 'Utilities/Release/release_cmake.cmake')
| -rw-r--r-- | Utilities/Release/release_cmake.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Utilities/Release/release_cmake.cmake b/Utilities/Release/release_cmake.cmake index 6fd1372..3a35ec3 100644 --- a/Utilities/Release/release_cmake.cmake +++ b/Utilities/Release/release_cmake.cmake @@ -34,7 +34,11 @@ if(NOT DEFINED CVS_COMMAND) set(CVS_COMMAND cvs) endif(NOT DEFINED CVS_COMMAND) -set(GIT_BRANCH ${CMAKE_CREATE_VERSION}) +if(${CMAKE_CREATE_VERSION} MATCHES "^(release|maint|next)$") + set(GIT_BRANCH origin/${CMAKE_CREATE_VERSION}) +else() + set(GIT_BRANCH ${CMAKE_CREATE_VERSION}) +endif() set( CMAKE_CHECKOUT "${CVS_COMMAND} -q -d ${CVSROOT} co -d ${CMAKE_CREATE_VERSION} ${CMAKE_CREATE_VERSION}") |