diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2017-02-10 14:16:04 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2017-02-10 22:57:40 +0100 |
| commit | 59174d8d16f6a3febd7446994bc8b5e58296e143 (patch) | |
| tree | 9ae30d98c341489fbb2a1efb842b015d4a10cd12 /cmake | |
| parent | d89d6b40ba1828d321168b1df11b6df4e8069418 (diff) | |
| download | dbus-59174d8d16f6a3febd7446994bc8b5e58296e143.tar.gz | |
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>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/dbus/CMakeLists.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt index dfc4842d..09fa1a72 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. |