summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Blum2011-10-23 10:59:22 -0700
committerJosh Blum2011-10-23 10:59:22 -0700
commit27fb36ed7b07b5055b47ae5509235acf816094e3 (patch)
treee30546ca67256bdc5d81a5c81dc82d4709b6e10b
parentfea70a9c312ebf9cfcf8b5ddb60db3b6a3004248 (diff)
downloadgnuradio-27fb36ed7b07b5055b47ae5509235acf816094e3.tar.gz
gnuradio-27fb36ed7b07b5055b47ae5509235acf816094e3.tar.bz2
gnuradio-27fb36ed7b07b5055b47ae5509235acf816094e3.zip
cmake: removed problematic/unused parsing of git describe
It became problematic when the git describe output changed to only have the first term before the dash: no rev count or hash. The parsing was copied from gr_git.m4. The result is not used so its ok to remove.
-rw-r--r--cmake/Modules/GrVersion.cmake18
1 files changed, 0 insertions, 18 deletions
diff --git a/cmake/Modules/GrVersion.cmake b/cmake/Modules/GrVersion.cmake
index 16338f143..7baa8eabb 100644
--- a/cmake/Modules/GrVersion.cmake
+++ b/cmake/Modules/GrVersion.cmake
@@ -56,24 +56,6 @@ else()
endif()
########################################################################
-# Parse the git describe string (currently unused)
-########################################################################
-unset(GIT_TAG)
-unset(GIT_SEQNO)
-unset(GIT_COMMIT)
-
-if(GIT_DESCRIBE)
- execute_process(
- COMMAND ${PYTHON_EXECUTABLE} -c
- "import re; print ';'.join(re.match('^v(.*)-(.*)-\\w(.*)$', '${GIT_DESCRIBE}').groups())"
- OUTPUT_VARIABLE GIT_DESCRIBES OUTPUT_STRIP_TRAILING_WHITESPACE
- )
- list(GET GIT_DESCRIBES 0 GIT_TAG)
- list(GET GIT_DESCRIBES 1 GIT_SEQNO)
- list(GET GIT_DESCRIBES 2 GIT_COMMIT)
-endif(GIT_DESCRIBE)
-
-########################################################################
# Use the logic below to set the version constants
########################################################################
if("${MINOR_VERSION}" STREQUAL "git")