Skip to content
Snippets Groups Projects
Commit bdaf1db7 authored by Tomáš Pecka's avatar Tomáš Pecka
Browse files

CMake: Fix lib versioning

parent 64431f26
No related branches found
No related tags found
1 merge request!70Dev tp
...@@ -229,6 +229,9 @@ class Generator: ...@@ -229,6 +229,9 @@ class Generator:
include_files=Helpers.join(project.find_install_sources()), include_files=Helpers.join(project.find_install_sources()),
find_packages=Helpers.join(map(lambda p: "find_package({})".format(p), finds), "\n"), find_packages=Helpers.join(map(lambda p: "find_package({})".format(p), finds), "\n"),
find_packages_tests=Helpers.join(map(lambda p: "find_package({})".format(p), test_finds), "\n"), find_packages_tests=Helpers.join(map(lambda p: "find_package({})".format(p), test_finds), "\n"),
alib_versioning_major=Config.get(CONFIG, 'Versioning', 'major'),
alib_versioning_minor=Config.get(CONFIG, 'Versioning', 'minor'),
alib_versioning_patch=Config.get(CONFIG, 'Versioning', 'patch'),
)) ))
   
@classmethod @classmethod
...@@ -243,6 +246,9 @@ class Generator: ...@@ -243,6 +246,9 @@ class Generator:
cmake_options=Helpers.join(["set({} {})".format(k.upper(), v) for k, v in project.cmake_additional_set], sep='\n'), cmake_options=Helpers.join(["set({} {})".format(k.upper(), v) for k, v in project.cmake_additional_set], sep='\n'),
source_files_test=Helpers.join(project.find_sources_test()), source_files_test=Helpers.join(project.find_sources_test()),
find_packages_tests=Helpers.join(map(lambda p: "find_package({})".format(p), test_finds), "\n"), find_packages_tests=Helpers.join(map(lambda p: "find_package({})".format(p), test_finds), "\n"),
alib_versioning_major=Config.get(CONFIG, 'Versioning', 'major'),
alib_versioning_minor=Config.get(CONFIG, 'Versioning', 'minor'),
alib_versioning_patch=Config.get(CONFIG, 'Versioning', 'patch'),
)) ))
   
@classmethod @classmethod
...@@ -257,6 +263,9 @@ class Generator: ...@@ -257,6 +263,9 @@ class Generator:
cmake_options=Helpers.join(["set({} {})".format(k.upper(), v) for k, v in project.cmake_additional_set], sep='\n'), cmake_options=Helpers.join(["set({} {})".format(k.upper(), v) for k, v in project.cmake_additional_set], sep='\n'),
source_files=Helpers.join(project.find_sources()), source_files=Helpers.join(project.find_sources()),
find_packages=Helpers.join(map(lambda p: "find_package({})".format(p), finds), "\n"), find_packages=Helpers.join(map(lambda p: "find_package({})".format(p), finds), "\n"),
alib_versioning_major=Config.get(CONFIG, 'Versioning', 'major'),
alib_versioning_minor=Config.get(CONFIG, 'Versioning', 'minor'),
alib_versioning_patch=Config.get(CONFIG, 'Versioning', 'patch'),
)) ))
   
@staticmethod @staticmethod
......
project({project_name}) project({project_name}
VERSION {alib_versioning_major}.{alib_versioning_minor}.{alib_versioning_patch}
LANGUAGES CXX)
set(PROJECT_NAME {project_name}) set(PROJECT_NAME {project_name})
   
find_package(tclap REQUIRED) find_package(tclap REQUIRED)
......
project({project_name}) project({project_name}
VERSION {alib_versioning_major}.{alib_versioning_minor}.{alib_versioning_patch}
LANGUAGES CXX)
set(PROJECT_NAME_TEST test-{project_name}) set(PROJECT_NAME_TEST test-{project_name})
   
{cmake_options} {cmake_options}
......
project({project_name}) project({project_name}
VERSION {alib_versioning_major}.{alib_versioning_minor}.{alib_versioning_patch}
LANGUAGES CXX)
set(PROJECT_NAME {project_name}) set(PROJECT_NAME {project_name})
   
{cmake_options} {cmake_options}
...@@ -28,8 +30,8 @@ set_target_properties(${{PROJECT_NAME}} PROPERTIES ...@@ -28,8 +30,8 @@ set_target_properties(${{PROJECT_NAME}} PROPERTIES
   
INTERFACE_POSITION_INDEPENDENT_CODE ON INTERFACE_POSITION_INDEPENDENT_CODE ON
   
VERSION ${{ALIB_VERSION}} VERSION ${{PROJECT_VERSION}}
SOVERSION ${{ALIB_VERSION_MAJOR}} SOVERSION ${{PROJECT_VERSION_MAJOR}}
) )
   
# if (CMAKE_BUILD_TYPE STREQUAL "Release") # if (CMAKE_BUILD_TYPE STREQUAL "Release")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment