third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2472 from Exiv2/fix_soversion

Browse Source 
Fix shared object versioning
This commit is contained in:
Miloš Komarčević 2023-04-17 21:36:18 +02:00 committed by GitHub
commit b4179adab8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -12,6 +12,15 @@ project(exiv2 # use TWEAK to categorize the build
LANGUAGES C CXX LANGUAGES C CXX
) )
# Shared Object versioning (SemVer-like: must bump major on API breakage)
if(PROJECT_VERSION_MAJOR EQUAL 0)
# support legacy scheme (e.g. 0.27.x -> 27)
set(EXIV2LIB_SOVERSION ${PROJECT_VERSION_MINOR})
else()
# restart from 30
math(EXPR EXIV2LIB_SOVERSION "30 + (${PROJECT_VERSION_MAJOR} - 1)")
endif()
if(NOT CMAKE_BUILD_TYPE) if(NOT CMAKE_BUILD_TYPE)
set (CMAKE_BUILD_TYPE Release) set (CMAKE_BUILD_TYPE Release)
endif() endif()

6
meson.build
View File

@ -32,6 +32,11 @@ exiv_conf = configure_file(output: 'exiv2lib_export.h', configuration: exiv_api)
cdata = configuration_data() cdata = configuration_data()
cdata.set('EXV_PACKAGE_NAME', meson.project_name()) cdata.set('EXV_PACKAGE_NAME', meson.project_name())
ver = meson.project_version().split('.') ver = meson.project_version().split('.')
if ver[0] == '0'
sover = ver[1].to_int()
else
sover = 30 + (ver[0].to_int() - 1)
endif
cdata.set('PROJECT_VERSION_MAJOR', ver[0]) cdata.set('PROJECT_VERSION_MAJOR', ver[0])
cdata.set('PROJECT_VERSION_MINOR', ver[1]) cdata.set('PROJECT_VERSION_MINOR', ver[1])
cdata.set('PROJECT_VERSION_PATCH', ver[2]) cdata.set('PROJECT_VERSION_PATCH', ver[2])
@ -308,6 +313,7 @@ exiv2 = library(
xmp_lib, xmp_lib,
cpp_args: cargs, cpp_args: cargs,
version: meson.project_version(), version: meson.project_version(),
soversion: sover,
gnu_symbol_visibility: 'hidden', gnu_symbol_visibility: 'hidden',
link_with: convertlib, link_with: convertlib,
dependencies: [deps, exiv2int_dep], dependencies: [deps, exiv2int_dep],

2
src/CMakeLists.txt
View File

@ -160,7 +160,7 @@ endif()
set_target_properties( exiv2lib PROPERTIES set_target_properties( exiv2lib PROPERTIES
VERSION ${PROJECT_VERSION} VERSION ${PROJECT_VERSION}
SOVERSION ${PROJECT_VERSION_MINOR} SOVERSION ${EXIV2LIB_SOVERSION}
OUTPUT_NAME exiv2 OUTPUT_NAME exiv2
PDB_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} PDB_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMPILE_FLAGS ${EXTRA_COMPILE_FLAGS} COMPILE_FLAGS ${EXTRA_COMPILE_FLAGS}