From aeb482fda990a77ac426f1b88fe715353fbe4317 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?= Date: Thu, 6 Mar 2014 23:22:33 +0000 Subject: [PATCH] Header install changes * Install archdep files into archdep directory * Install headers into /include/dbus-1 instead of /include https://bugs.freedesktop.org/show_bug.cgi?id=73636 --- cmake/dbus/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt index a6aaba0..3c8ccd5 100644 --- a/cmake/dbus/CMakeLists.txt +++ b/cmake/dbus/CMakeLists.txt @@ -22,6 +22,8 @@ set (dbusinclude_HEADERS ${DBUS_DIR}/dbus-syntax.h ${DBUS_DIR}/dbus-threads.h ${DBUS_DIR}/dbus-types.h +) +set (dbuslibinclude_HEADERS dbus-arch-deps.h ) @@ -286,7 +288,8 @@ else(WIN32) endif(WIN32) install(TARGETS dbus-1 ${INSTALL_TARGETS_DEFAULT_ARGS}) -install_files(/include/dbus FILES ${dbusinclude_HEADERS}) +install_files(/include/dbus-1.0/dbus FILES ${dbusinclude_HEADERS}) +install_files(/lib/dbus-1.0/include/dbus FILES ${dbuslibinclude_HEADERS}) ### Internal library, used for the daemon, tools and tests, compiled statically. -- 1.8.4