From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Fri, 10 Feb 2017 13:16:04 +0000 (+0100)
Subject: Let cmake install arch depending headers on Unix in the same location as autotools.
X-Git-Tag: dbus-1.11.10~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59174d8d16f6a3febd7446994bc8b5e58296e143;p=thirdparty%2Fdbus.git

Let cmake install arch depending headers on Unix in the same location as autotools.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99752
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt
index dfc4842d5..09fa1a729 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 (dbusinclude_ARCH_HEADERS
 	${CMAKE_CURRENT_BINARY_DIR}/dbus-arch-deps.h
 )
 
@@ -304,7 +306,12 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
 endif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
 
 install(TARGETS dbus-1 ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES ${dbusinclude_HEADERS} DESTINATION include/dbus)
+if(UNIX)
+    install(FILES ${dbusinclude_HEADERS} DESTINATION include/dbus-1.0/dbus)
+    install(FILES ${dbusinclude_ARCH_HEADERS} DESTINATION lib/dbus-1.0/include/dbus)
+else()
+    install(FILES ${dbusinclude_HEADERS} ${dbusinclude_ARCH_HEADERS} DESTINATION include/dbus)
+endif()
 
 ### Internal library, used for the daemon, tools and tests, compiled statically.