diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-04-03 17:51:53 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-04-03 17:51:53 -0400 |
| commit | 0c1b35d17e9aa5058f58fd8763bb292613b3658a (patch) | |
| tree | 693ae5b34a3ec487d73a94c42bcb9b000ee615f6 | |
| parent | e2b1a980dc51c9ae2102d0756818db1215b1ef10 (diff) | |
| parent | f2ed379e1fe27096bdfc62ae715d870bcde9a5d1 (diff) | |
Merge branch 'cmake_version' into cmake_builds
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | cmake/Modules/GrVersion.cmake | 11 | ||||
| -rw-r--r-- | version.sh | 4 |
3 files changed, 5 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3af942c1ea..8430164c1b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,6 +38,11 @@ set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "") list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules) +# Set the version information here +set(VERSION_INFO_MAJOR_VERSION 3) +set(VERSION_INFO_API_COMPAT 6) +set(VERSION_INFO_MINOR_VERSION 0) +set(VERSION_INFO_MAINT_VERSION 0) include(GrVersion) #setup version info ######################################################################## diff --git a/cmake/Modules/GrVersion.cmake b/cmake/Modules/GrVersion.cmake index 7aa13f556e..f822465255 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}) diff --git a/version.sh b/version.sh deleted file mode 100644 index 0fe19786c4..0000000000 --- a/version.sh +++ /dev/null @@ -1,4 +0,0 @@ -MAJOR_VERSION=3 -API_COMPAT=6 -MINOR_VERSION=git -MAINT_VERSION=0 |