Attachment 118618 Details for Bug 83539 – cmake: simplify definition of installation paths

[patch] cmake: simplify definition of installation paths

0003-cmake-simplify-definition-of-installation-paths.patch (text/plain), 1.83 KB, created by Simon McVittie on 2015-10-02 15:57:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2015-10-02 15:57:43 UTC

Size: 1.83 KB

patch

obsolete

>From b2d64ffd432587883fbdd062113cffaf2b921f04 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Fri, 2 Oct 2015 16:24:21 +0100
>Subject: [PATCH 3/4] cmake: simplify definition of installation paths
>
>In particular, changing the meaning of DBUS_DATADIR part
>way through the file is really confusing.
>---
> cmake/CMakeLists.txt | 20 ++------------------
> 1 file changed, 2 insertions(+), 18 deletions(-)
>
>diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
>index 4db9c67..4bde279 100644
>--- a/cmake/CMakeLists.txt
>+++ b/cmake/CMakeLists.txt
>@@ -61,23 +61,6 @@ else (DBUS_INSTALL_DIR)
> 	set(DBUS_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
> endif (DBUS_INSTALL_DIR)
> 
>-# autotools style
>-if (NOT DATAROOTDIR)
>-    set (DATAROOTDIR share)
>-endif()
>-
>-if (NOT DATADIR)
>-    set (DATADIR ${DATAROOTDIR})
>-endif()
>-
>-if (NOT DOCDIR)
>-    SET(DOCDIR ${DATAROOTDIR}/doc/dbus)
>-endif()
>-
>-if (NOT DBUS_DATADIR)
>-    SET(DBUS_DATADIR ${DATADIR})
>-endif()
>-
> set(DBUS_PREFIX ${DBUS_INSTALL_DIR})
> 
> set(prefix                   ${DBUS_INSTALL_DIR})
>@@ -87,7 +70,7 @@ set(EXPANDED_INCLUDEDIR      ${DBUS_INSTALL_DIR}/include)
> set(EXPANDED_BINDIR          ${DBUS_INSTALL_DIR}/bin)
> set(EXPANDED_SYSCONFDIR      ${DBUS_INSTALL_DIR}/etc)
> set(EXPANDED_LOCALSTATEDIR   ${DBUS_INSTALL_DIR}/var)
>-set(EXPANDED_DATADIR         ${DBUS_INSTALL_DIR}/${DBUS_DATADIR})
>+set(EXPANDED_DATADIR         ${DBUS_INSTALL_DIR}/share)
> set(DBUS_MACHINE_UUID_FILE   ${DBUS_INSTALL_DIR}/lib/dbus/machine-id)
> set(DBUS_BINDIR              ${EXPANDED_BINDIR})
> set(DBUS_DAEMONDIR           ${EXPANDED_BINDIR})
>@@ -106,6 +89,7 @@ set(SYSCONFDIR_FROM_PKGDATADIR ${EXPANDED_SYSCONFDIR})
> set(DATADIR_FROM_PKGSYSCONFDIR ${EXPANDED_DATADIR})
> endif()
> 
>+# used in the C code
> set(DBUS_LIBEXECDIR          ${EXPANDED_LIBDIR})
> set(DBUS_DATADIR             ${EXPANDED_DATADIR})
> 
>-- 
>2.6.0
>

Actions: View | Splinter Review

Attachments on bug 83539: 105816 | 106930 | 106931 | 113363 | 113364 | 113377 | 118346 | 118349 | 118350 | 118540 | 118617 | 118618 | 118652

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.