diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/Modules/GrVersion.cmake | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ba48168b68..f5a251d4e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,7 @@ message(STATUS "Build type set to ${CMAKE_BUILD_TYPE}.") set(VERSION_INFO_MAJOR_VERSION 3) set(VERSION_INFO_API_COMPAT 7) set(VERSION_INFO_MINOR_VERSION 12) -set(VERSION_INFO_MAINT_VERSION git) +set(VERSION_INFO_MAINT_VERSION 0) include(GrVersion) #setup version info # Minimum dependency versions for central dependencies: diff --git a/cmake/Modules/GrVersion.cmake b/cmake/Modules/GrVersion.cmake index 414c34d64f..938d14e60d 100644 --- a/cmake/Modules/GrVersion.cmake +++ b/cmake/Modules/GrVersion.cmake @@ -83,11 +83,7 @@ else() # VERSION: 3.3.1{.x} # DOCVER: 3.3.1{.x} # LIBVER: 3.3.1{.x} - if("${MAINT_VERSION}" STREQUAL "0") - set(VERSION "${MAJOR_VERSION}.${API_COMPAT}.${MINOR_VERSION}") - else() - set(VERSION "${MAJOR_VERSION}.${API_COMPAT}.${MINOR_VERSION}.${MAINT_VERSION}") - endif() + set(VERSION "${MAJOR_VERSION}.${API_COMPAT}.${MINOR_VERSION}.${MAINT_VERSION}") set(DOCVER "${VERSION}") set(LIBVER "${VERSION}") set(RC_MINOR_VERSION ${MINOR_VERSION}) |