Use predefined version variable

steveire · Nov 26, 2019 · a6ead12c436848d5f0bba911aaa57a463abd9586 · a6ead12
1 parent b2e3d25
commit a6ead12c436848d5f0bba911aaa57a463abd9586
Unified Split

Showing with 5 additions and 6 deletions.

+1 −2 CMakeLists.txt

+1 −1 cmake/modules/Doxyfile.in

+1 −1 templates/lib/CMakeLists.txt

+1 −1 templates/lib/grantlee_version.h.cmake

+1 −1 textdocument/lib/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -75,7 +75,6 @@ set(CMAKE_AUTOMOC ON)
 set(Grantlee5_MIN_PLUGIN_VERSION 0)
 
 set(Grantlee5_MAJOR_MINOR_VERSION_STRING "${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}" )
-set(Grantlee5_VERSION_STRING "${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}.${Grantlee5_VERSION_PATCH}" )
 
 set (LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (eg. '64')")
 
@@ -106,7 +105,7 @@ configure_file(
 
 include(CMakePackageConfigHelpers)
 write_basic_package_version_file("${CMAKE_BINARY_DIR}/Grantlee${Grantlee5_VERSION_MAJOR}ConfigVersion.cmake"
-  VERSION ${Grantlee5_VERSION_STRING}
+  VERSION ${Grantlee5_VERSION}
   COMPATIBILITY AnyNewerVersion
 )
 

diff --git a/cmake/modules/Doxyfile.in b/cmake/modules/Doxyfile.in
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = Grantlee
-PROJECT_NUMBER         = @Grantlee5_VERSION_MAJOR@.@Grantlee5_VERSION_MINOR@.@Grantlee5_VERSION_PATCH@
+PROJECT_NUMBER         = @Grantlee5_VERSION@
 OUTPUT_DIRECTORY       = @DOCS_OUTPUT_DIRECTORY@
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English

diff --git a/templates/lib/CMakeLists.txt b/templates/lib/CMakeLists.txt
@@ -122,7 +122,7 @@ target_link_libraries(Grantlee_Templates
 )
 
 set_target_properties(Grantlee_Templates PROPERTIES
-  VERSION    ${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}.${Grantlee5_VERSION_PATCH}
+  VERSION    ${Grantlee5_VERSION}
   SOVERSION  ${Grantlee5_TEMPLATES_LIB_SOVERSION}
 )
 

diff --git a/templates/lib/grantlee_version.h.cmake b/templates/lib/grantlee_version.h.cmake
@@ -1,6 +1,6 @@
 #define GRANTLEE_VERSION_MAJOR @Grantlee5_VERSION_MAJOR@
 #define GRANTLEE_VERSION_MINOR @Grantlee5_VERSION_MINOR@
 #define GRANTLEE_VERSION_PATCH @Grantlee5_VERSION_PATCH@
-#define GRANTLEE_VERSION_STRING "@Grantlee5_VERSION_STRING@"
+#define GRANTLEE_VERSION_STRING "@Grantlee5_VERSION@"
 #define GRANTLEE_MAJOR_MINOR_VERSION_STRING "@Grantlee5_MAJOR_MINOR_VERSION_STRING@"
 #define GRANTLEE_MIN_PLUGIN_VERSION @Grantlee5_MIN_PLUGIN_VERSION@
diff --git a/textdocument/lib/CMakeLists.txt b/textdocument/lib/CMakeLists.txt
@@ -46,7 +46,7 @@ target_link_libraries(Grantlee_TextDocument
 )
 
 set_target_properties(Grantlee_TextDocument PROPERTIES
-  VERSION    ${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}.${Grantlee5_VERSION_PATCH}
+  VERSION    ${Grantlee5_VERSION}
   SOVERSION  ${Grantlee5_TEXTDOCUMENT_LIB_SOVERSION}
 )