Attachment 95342 Details for Bug 75858 – Process and install pkg-config files for dbus (v2)

[patch] Process and install pkg-config files for dbus (v2)

0002-Process-and-install-pkg-config-files-for-dbus-v2.patch (text/plain), 1.50 KB, created by LRN on 2014-03-08 07:36:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: LRN

Created: 2014-03-08 07:36:33 UTC

Size: 1.50 KB

patch

obsolete

>From a82e6e53112dbbbd2ca679648f23214b0b2b3f3a Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
> =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
>Date: Sat, 8 Mar 2014 07:35:02 +0000
>Subject: [PATCH 2/2] Process and install pkg-config files for dbus (v2)
>
>---
> cmake/CMakeLists.txt | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
>diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
>index cf16502..f7b7f8c 100644
>--- a/cmake/CMakeLists.txt
>+++ b/cmake/CMakeLists.txt
>@@ -77,7 +77,13 @@ set(EXPANDED_DATADIR         ${DBUS_INSTALL_DIR}/${DBUS_DATADIR})
> set(DBUS_MACHINE_UUID_FILE   ${DBUS_INSTALL_DIR}/lib/dbus/machine-id)
> set(DBUS_BINDIR              ${EXPANDED_BINDIR})
> set(DBUS_DAEMONDIR           ${EXPANDED_BINDIR})
>-
>+if (NOT dbus_daemondir)
>+  set(dbus_daemondir ${DBUS_DAEMONDIR})
>+endif()
>+set(libdir \${prefix}/lib)
>+set(includedir \${prefix}/include)
>+set(sysconfdir \${prefix}/etc)
>+set(datadir \${prefix}/share)
> 
> #enable building of shared library
> SET(BUILD_SHARED_LIBS ON)
>@@ -501,6 +507,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dbus-env.bat.cmake ${CMAKE_BINARY_DIR
> install_files(/bin FILES ${CMAKE_BINARY_DIR}/bin/dbus-env.bat)
> endif()
> 
>+configure_file(${CMAKE_SOURCE_DIR}/../dbus-1.pc.in ${CMAKE_BINARY_DIR}/../dbus-1.pc @ONLY)
>+install(FILES ${CMAKE_BINARY_DIR}/../dbus-1.pc DESTINATION ${EXPANDED_LIBDIR}/pkgconfig)
>+
> add_definitions(-DHAVE_CONFIG_H=1)
> 
> ########### subdirs ###############
>-- 
>1.8.4
>

Actions: View | Splinter Review

Attachments on bug 75858: 95264 | 95265 | 95341 | 95342 | 95349 | 95944 | 98131 | 98256

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.