From c240bf267e950294234062085e9ab59609599b8c Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Fri, 10 Feb 2017 14:16:04 +0100 Subject: [PATCH] Let cmake install arch depending headers on Unix in the same location as autotools. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99752 --- cmake/dbus/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt index dfc4842..09fa1a7 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. -- 2.6.6