diff options
| author | Marcus Müller <mueller@kit.edu> | 2019-07-15 21:07:12 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2019-07-17 21:44:11 +0200 |
| commit | 37528f7a89e70ca50651dccf43ab7b61792486ad (patch) | |
| tree | 7d6731b08491ad9a5f42d9138f5c0bb9ce34c872 | |
| parent | a3db203065f8ea2812cb4a560dcb8b91cdfdff14 (diff) | |
Renaming the VERSION_INFO_* to VERSION_ macros consistent w/ VERSIONING
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | cmake/Modules/GnuradioConfigVersion.cmake.in | 8 | ||||
| -rw-r--r-- | cmake/Modules/GrVersion.cmake | 8 | ||||
| -rw-r--r-- | gr-utils/python/modtool/templates/gr-newmod/CMakeLists.txt | 8 |
4 files changed, 16 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 21b9246203..4adb01210e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,10 +47,10 @@ SET(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "") message(STATUS "Build type set to ${CMAKE_BUILD_TYPE}.") # Set the version information here -SET(VERSION_INFO_MAJOR_VERSION 3) -SET(VERSION_INFO_API_COMPAT 8) -SET(VERSION_INFO_MINOR_VERSION git) -SET(VERSION_INFO_MAINT_VERSION 0) +SET(VERSION_MAJOR 3) +SET(VERSION_API 8) +SET(VERSION_ABI git) +SET(VERSION_PATCH 0) include(GrVersion) #setup version info # Minimum dependency versions for central dependencies: diff --git a/cmake/Modules/GnuradioConfigVersion.cmake.in b/cmake/Modules/GnuradioConfigVersion.cmake.in index 4e3d626176..d33c8ba31e 100644 --- a/cmake/Modules/GnuradioConfigVersion.cmake.in +++ b/cmake/Modules/GnuradioConfigVersion.cmake.in @@ -17,10 +17,10 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -set(MAJOR_VERSION @VERSION_INFO_MAJOR_VERSION@) -set(API_COMPAT @VERSION_INFO_API_COMPAT@) -set(MINOR_VERSION @VERSION_INFO_MINOR_VERSION@) -set(MAINT_VERSION @VERSION_INFO_MAINT_VERSION@) +set(MAJOR_VERSION @VERSION_MAJOR@) +set(API_COMPAT @VERSION_API@) +set(MINOR_VERSION @VERSION_ABI@) +set(MAINT_VERSION @VERSION_PATCH@) set(PACKAGE_VERSION ${MAJOR_VERSION}.${API_COMPAT}.${MINOR_VERSION}.${MAINT_VERSION}) diff --git a/cmake/Modules/GrVersion.cmake b/cmake/Modules/GrVersion.cmake index a899442a58..fc83b1686b 100644 --- a/cmake/Modules/GrVersion.cmake +++ b/cmake/Modules/GrVersion.cmake @@ -23,10 +23,10 @@ endif() set(__INCLUDED_GR_VERSION_CMAKE TRUE) #eventually, replace version.sh and fill in the variables below -set(MAJOR_VERSION ${VERSION_INFO_MAJOR_VERSION}) -set(API_COMPAT ${VERSION_INFO_API_COMPAT}) -set(MINOR_VERSION ${VERSION_INFO_MINOR_VERSION}) -set(MAINT_VERSION ${VERSION_INFO_MAINT_VERSION}) +set(MAJOR_VERSION ${VERSION_MAJOR}) +set(API_COMPAT ${VERSION_API}) +set(MINOR_VERSION ${VERSION_ABI}) +set(MAINT_VERSION ${VERSION_PATCH}) ######################################################################## # Extract the version string from git describe. diff --git a/gr-utils/python/modtool/templates/gr-newmod/CMakeLists.txt b/gr-utils/python/modtool/templates/gr-newmod/CMakeLists.txt index 3b30732755..9f9de987e8 100644 --- a/gr-utils/python/modtool/templates/gr-newmod/CMakeLists.txt +++ b/gr-utils/python/modtool/templates/gr-newmod/CMakeLists.txt @@ -42,10 +42,10 @@ set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "") list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules) # Set the version information here -set(VERSION_INFO_MAJOR_VERSION 1) -set(VERSION_INFO_API_COMPAT 0) -set(VERSION_INFO_MINOR_VERSION 0) -set(VERSION_INFO_MAINT_VERSION git) +set(VERSION_MAJOR 1) +set(VERSION_API 0) +set(VERSION_ABI 0) +set(VERSION_PATCH git) cmake_policy(SET CMP0011 NEW) |