Skip to content
Permalink
Browse files

Use predefined version variable

  • Loading branch information
steveire committed Nov 26, 2019
1 parent b2e3d25 commit a6ead12c436848d5f0bba911aaa57a463abd9586
@@ -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
)

@@ -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
@@ -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}
)

@@ -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@
@@ -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}
)

0 comments on commit a6ead12

Please sign in to comment.
You can’t perform that action at this time.