Skip to content

Commit

Permalink
cmake: Set correct sonames for libprotobuf-lite.so and libprotoc.so (p…
Browse files Browse the repository at this point in the history
…rotocolbuffers#8635)

Soname was set for libprotobuf.so in commit a9cf69a,
but similar changes for libprotobuf-lite.so and libprotoc.so were missed.
  • Loading branch information
Arfrever Frehtes Taifersar Arahesis authored and Arfrever Frehtes Taifersar Arahesis committed Feb 18, 2022
1 parent 763d852 commit d9f97de
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
1 change: 1 addition & 0 deletions cmake/libprotobuf-lite.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ if(protobuf_BUILD_SHARED_LIBS)
endif()
set_target_properties(libprotobuf-lite PROPERTIES
VERSION ${protobuf_VERSION}
SOVERSION 30
OUTPUT_NAME ${LIB_PREFIX}protobuf-lite
DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite)
1 change: 0 additions & 1 deletion cmake/libprotobuf.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ if(protobuf_BUILD_SHARED_LIBS)
endif()
set_target_properties(libprotobuf PROPERTIES
VERSION ${protobuf_VERSION}
# Use only the first SO version component for compatibility with Makefile emitted SONAME.
SOVERSION 30
OUTPUT_NAME ${LIB_PREFIX}protobuf
DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
Expand Down
1 change: 1 addition & 0 deletions cmake/libprotoc.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ endif()
set_target_properties(libprotoc PROPERTIES
COMPILE_DEFINITIONS LIBPROTOC_EXPORTS
VERSION ${protobuf_VERSION}
SOVERSION 30
OUTPUT_NAME ${LIB_PREFIX}protoc
DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
add_library(protobuf::libprotoc ALIAS libprotoc)
16 changes: 11 additions & 5 deletions update_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,17 @@ def RewriteTextFile(filename, line_rewriter):


def UpdateCMake():
RewriteTextFile('cmake/libprotobuf.cmake',
lambda line : re.sub(
r'SOVERSION [0-9]+\.[0-9]+(\.[0-9]+)?',
'SOVERSION %s' % GetSharedObjectVersion()[0],
line))
cmake_files = (
'cmake/libprotobuf.cmake',
'cmake/libprotobuf-lite.cmake',
'cmake/libprotoc.cmake'
)
for cmake_file in cmake_files:
RewriteTextFile(cmake_file,
lambda line : re.sub(
r'SOVERSION [0-9]+\.[0-9]+(\.[0-9]+)?',
'SOVERSION %s' % GetSharedObjectVersion()[0],
line))


def UpdateConfigure():
Expand Down

0 comments on commit d9f97de

Please sign in to comment.