Attachment 113423 Details for Bug 83115 – [patch 4] Link libdbus-internal to the shared libdbus-1 under CMake, too (rebased)

[patch] [patch 4] Link libdbus-internal to the shared libdbus-1 under CMake, too (rebased)

0001-Link-libdbus-internal-to-the-shared-libdbus-1-under-.patch (text/plain), 2.01 KB, created by Ralf Habacker on 2015-02-12 22:14:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2015-02-12 22:14:50 UTC

Size: 2.01 KB

patch

obsolete

>From 26a04ec4d6317ff5c6b09e774f8f544673c50f30 Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Thu, 12 Feb 2015 22:42:27 +0100
>Subject: [PATCH 4/7] Link libdbus-internal to the shared libdbus-1 under
> CMake, too.
>
>---
> cmake/CMakeLists.txt      | 5 +----
> cmake/dbus/CMakeLists.txt | 7 +------
> 2 files changed, 2 insertions(+), 10 deletions(-)
>
>diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
>index b997f8b..05b167c 100644
>--- a/cmake/CMakeLists.txt
>+++ b/cmake/CMakeLists.txt
>@@ -476,10 +476,7 @@ set(DBUS_INTERNAL_LIBRARIES dbus-internal)
> # settings for building and using static internal lib
> # important note: DBUS_INTERNAL_xxxxx_DEFINITIONS must *not* be set when building dbus-1 library
> set (DBUS_INTERNAL_ADD_LIBRARY_OPTIONS STATIC)
>-set (DBUS_INTERNAL_LIBRARY_DEFINITIONS "-DDBUS_STATIC_BUILD")
>-# For now, the CMake build system doesn't support replacing the internal
>-# main loop with dbus-glib
>-set (DBUS_INTERNAL_CLIENT_DEFINITIONS "-DDBUS_STATIC_BUILD -DDBUS_COMPILATION -DDBUS_TEST_USE_INTERNAL")
>+set (DBUS_INTERNAL_CLIENT_DEFINITIONS "-DDBUS_COMPILATION -DDBUS_TEST_USE_INTERNAL")
> 
> configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
> 
>diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt
>index a6aaba0..7c6b1ee 100644
>--- a/cmake/dbus/CMakeLists.txt
>+++ b/cmake/dbus/CMakeLists.txt
>@@ -291,15 +291,10 @@ install_files(/include/dbus FILES ${dbusinclude_HEADERS})
> ### Internal library, used for the daemon, tools and tests, compiled statically.
> 
> add_library(dbus-internal ${DBUS_INTERNAL_ADD_LIBRARY_OPTIONS}
>-			${DBUS_LIB_SOURCES}
>-			${DBUS_LIB_HEADERS}
>-			${DBUS_SHARED_SOURCES}
>-			${DBUS_SHARED_HEADERS}
> 			${DBUS_UTIL_SOURCES}
> 			${DBUS_UTIL_HEADERS}
> )
>-target_link_libraries(dbus-internal)
>-set_target_properties(dbus-internal PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_LIBRARY_DEFINITIONS})
>+target_link_libraries(dbus-internal dbus-1)
> if(WIN32)
>     if(WINCE)
>         target_link_libraries(dbus-internal ws2)
>-- 
>1.8.4.5
>

Actions: View | Splinter Review

Attachments on bug 83115: 105309 | 105441 | 105887 | 106146 | 106147 | 106150 | 106687 | 106688 | 106689 | 113423 | 113424 | 113673 | 113686 | 113687 | 113688 | 113690 | 113691 | 113692 | 113697 | 113698 | 113702

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.