Attachment 93016 Details for Bug 74117 – Keep cmake generated shared dbus-1 library file name in sync with autotools (update 1)

[patch] Keep cmake generated shared dbus-1 library file name in sync with autotools (update 1)

0001-Keep-cmake-generated-shared-dbus-1-library-file-name.patch (text/plain), 3.59 KB, created by Ralf Habacker on 2014-01-29 22:51:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2014-01-29 22:51:19 UTC

Size: 3.59 KB

patch

obsolete

>From 75f3fbb0b73836d27eb750e38078c38b4b2f3f57 Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Mon, 27 Jan 2014 08:54:27 +0100
>Subject: [PATCH] Keep cmake generated shared dbus-1 library file name in sync
> with autotools.
>
>Autotools uses a versioned shared library name derived from libtool.
>This patch adds a versioned shared library name to cmake builds for all
>supported platforms. Binary compatibility for clients build against older
>cmake generated binary packages of dbus is provided; on unix like os
>with symbolic links and on Windows with a copy of the shared library.
>---
> cmake/CMakeLists.txt                |  1 -
> cmake/dbus/CMakeLists.txt           | 16 ++++++++++++++++
> cmake/modules/MacrosAutotools.cmake |  7 ++++++-
> 3 files changed, 22 insertions(+), 2 deletions(-)
>
>diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
>index fd6c525..d0e305d 100644
>--- a/cmake/CMakeLists.txt
>+++ b/cmake/CMakeLists.txt
>@@ -132,7 +132,6 @@ if(VCS)
> endif(VCS)
> 
> if(WIN32)
>-	set(CMAKE_DEBUG_POSTFIX "d")
> 	if(MSVC)
> 		# controll folders in msvc projects
> 		include(ProjectSourceGroup)
>diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt
>index a5481b7..4a15f8c 100644
>--- a/cmake/dbus/CMakeLists.txt
>+++ b/cmake/dbus/CMakeLists.txt
>@@ -261,13 +261,29 @@ add_library(dbus-1 SHARED
> 			${libdbus_SOURCES}
> 			${libdbus_HEADERS}
> )
>+if(DBUS_LIBRARY_REVISION)
>+    math(EXPR DBUS_LIBRARY_MAJOR "${DBUS_LIBRARY_CURRENT} - ${DBUS_LIBRARY_AGE}")
>+endif()
>+
> if(WIN32)
>+    if(DBUS_LIBRARY_REVISION)
>+        get_target_property(LEGACY_FILE_NAME dbus-1 LOCATION)
>+        set_target_properties(dbus-1 PROPERTIES SUFFIX "-${DBUS_LIBRARY_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX}")
>+        add_custom_command(TARGET dbus-1 POST_BUILD
>+            COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:dbus-1>" "${LEGACY_FILE_NAME}"
>+            COMMENT "Create non versioned dbus-1 library for legacy applications"
>+        )
>+        install(FILES ${LEGACY_FILE_NAME} DESTINATION bin)
>+    endif()
>     if(WINCE)
>         target_link_libraries(dbus-1 ws2)
>     else(WINCE)
>         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_MAJOR}.${DBUS_LIBRARY_AGE}.${DBUS_LIBRARY_REVISION} SOVERSION ${DBUS_LIBRARY_MAJOR})
>+    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 68e8ae5..2b1c59d 100644
>--- a/cmake/modules/MacrosAutotools.cmake
>+++ b/cmake/modules/MacrosAutotools.cmake
>@@ -10,6 +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)
>@@ -19,7 +22,9 @@ 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.1.4
>

Actions: View | Splinter Review

Attachments on bug 74117: 92930 | 92931 | 92935 | 93016

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.