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 /cmake/Modules | |
| parent | a3db203065f8ea2812cb4a560dcb8b91cdfdff14 (diff) | |
Renaming the VERSION_INFO_* to VERSION_ macros consistent w/ VERSIONING
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/GnuradioConfigVersion.cmake.in | 8 | ||||
| -rw-r--r-- | cmake/Modules/GrVersion.cmake | 8 |
2 files changed, 8 insertions, 8 deletions
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. |