diff options
| author | Johnathan Corgan | 2012-04-01 17:30:25 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-04-01 17:31:26 -0700 |
| commit | 5805e7647d14a64bb86d0e83898ebda764f57c31 (patch) | |
| tree | 569ee5753844c9cd6e83dea0f22db0a857709ffd /cmake/Modules/GrVersion.cmake | |
| parent | de0070d765ea31befcbc14eaecae2b934eec4afb (diff) | |
| parent | f2ed379e1fe27096bdfc62ae715d870bcde9a5d1 (diff) | |
| download | gnuradio-5805e7647d14a64bb86d0e83898ebda764f57c31.tar.gz gnuradio-5805e7647d14a64bb86d0e83898ebda764f57c31.tar.bz2 gnuradio-5805e7647d14a64bb86d0e83898ebda764f57c31.zip | |
Merge remote branch 'tom/cmake_version' into next
* Changed version to make it build 3.6git, not 3.6.0.0
Diffstat (limited to 'cmake/Modules/GrVersion.cmake')
| -rw-r--r-- | cmake/Modules/GrVersion.cmake | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/cmake/Modules/GrVersion.cmake b/cmake/Modules/GrVersion.cmake index 7aa13f556..f82246525 100644 --- a/cmake/Modules/GrVersion.cmake +++ b/cmake/Modules/GrVersion.cmake @@ -22,17 +22,6 @@ if(DEFINED __INCLUDED_GR_VERSION_CMAKE) endif() set(__INCLUDED_GR_VERSION_CMAKE TRUE) -######################################################################## -# Extract variables from version.sh -######################################################################## -include(GrPython) -message(STATUS "Extracting version information from version.sh...") -execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "print open('${CMAKE_SOURCE_DIR}/version.sh').read().replace('=', ';').replace('\\n', ';')" - OUTPUT_VARIABLE VERSION_INFO OUTPUT_STRIP_TRAILING_WHITESPACE -) -include(CMakeParseArgumentsCopy) -CMAKE_PARSE_ARGUMENTS(VERSION_INFO "" "MAJOR_VERSION;API_COMPAT;MINOR_VERSION;MAINT_VERSION" "" ${VERSION_INFO}) - #eventually, replace version.sh and fill in the variables below set(MAJOR_VERSION ${VERSION_INFO_MAJOR_VERSION}) set(API_COMPAT ${VERSION_INFO_API_COMPAT}) |