]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
Let cmake install arch depending headers on Unix in the same location as autotools.
authorRalf Habacker <ralf.habacker@freenet.de>
Fri, 10 Feb 2017 13:16:04 +0000 (14:16 +0100)
committerRalf Habacker <ralf.habacker@freenet.de>
Fri, 10 Feb 2017 21:57:40 +0000 (22:57 +0100)
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99752
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
cmake/dbus/CMakeLists.txt

index dfc4842d5bf4eb61db5b1770f05ce749f5f8682d..09fa1a729685bb782495b2bae97f029c0a45a694 100644 (file)
@@ -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.