From b8151e0885a9a1c241a2a9f0ffce910b4acfed04 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Tue, 28 Jan 2014 16:56:52 +0100 Subject: [PATCH] Keep cmake generated shared library filename in sync with autotools on unix. --- cmake/dbus/CMakeLists.txt | 3 +++ cmake/modules/MacrosAutotools.cmake | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt index 4ea77e8..594dd66 100644 --- a/cmake/dbus/CMakeLists.txt +++ b/cmake/dbus/CMakeLists.txt @@ -277,6 +277,9 @@ if(WIN32) target_link_libraries(dbus-1 ws2_32 advapi32 netapi32 iphlpapi) endif(WINCE) else(WIN32) + if(DBUS_LIBRARY_REVISION) + set_target_properties(dbus-1 PROPERTIES VERSION ${DBUS_LIBRARY_REVISION}.${DBUS_LIBRARY_AGE}.${DBUS_LIBRARY_REVISION} SOVERSION ${DBUS_LIBRARY_REVISION}) + endif() target_link_libraries(dbus-1 ${CMAKE_THREAD_LIBS_INIT} rt) endif(WIN32) diff --git a/cmake/modules/MacrosAutotools.cmake b/cmake/modules/MacrosAutotools.cmake index 62e9a00..ed76210 100644 --- a/cmake/modules/MacrosAutotools.cmake +++ b/cmake/modules/MacrosAutotools.cmake @@ -10,7 +10,9 @@ # ${prefix}_MAJOR_VERSION # ${prefix}_MINOR_VERSION # ${prefix}_MICRO_VERSION +# ${prefix}_LIBRARY_AGE # ${prefix}_LIBRARY_REVISION +# ${prefix}_LIBRARY_CURRENT # macro(autoversion config prefix) file (READ ${config} _configure_ac) @@ -20,6 +22,8 @@ macro(autoversion config prefix) string (REGEX REPLACE ".*${prefix}_micro_version], .([0-9]+).*" "\\1" ${prefix_upper}_MICRO_VERSION ${_configure_ac}) set (${prefix_upper}_VERSION ${${prefix_upper}_MAJOR_VERSION}.${${prefix_upper}_MINOR_VERSION}.${${prefix_upper}_MICRO_VERSION}) set (${prefix_upper}_VERSION_STRING "${${prefix_upper}_VERSION}") + string (REGEX REPLACE ".*LT_AGE=([0-9]).*" "\\1" ${prefix_upper}_LIBRARY_AGE ${_configure_ac}) + string (REGEX REPLACE ".*LT_CURRENT=([0-9]).*" "\\1" ${prefix_upper}_LIBRARY_CURRENT ${_configure_ac}) string (REGEX REPLACE ".*LT_REVISION=([0-9]).*" "\\1" ${prefix_upper}_LIBRARY_REVISION ${_configure_ac}) endmacro() -- 1.8.4