diff options
| author | Johnathan Corgan | 2012-04-07 19:32:10 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-04-07 19:32:10 -0700 |
| commit | 9bef26c9271a7b9253075bda3c1fc7c8078c0343 (patch) | |
| tree | a6c1329bb902c95c8ab9970f38ec5fb46d79167c /cmake/Modules | |
| parent | f621a52f779381cfe550b4278b83e701a747944c (diff) | |
| parent | ef72dc714840dfb8fe3f918dda243f74453b6cc7 (diff) | |
| download | gnuradio-9bef26c9271a7b9253075bda3c1fc7c8078c0343.tar.gz gnuradio-9bef26c9271a7b9253075bda3c1fc7c8078c0343.tar.bz2 gnuradio-9bef26c9271a7b9253075bda3c1fc7c8078c0343.zip | |
Merge branch 'next'
Diffstat (limited to 'cmake/Modules')
| -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}) |