]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
cmake: Keep include file install locations on Windows in sync with Unix.
authorRalf Habacker <ralf.habacker@freenet.de>
Fri, 10 Feb 2017 20:48:56 +0000 (21:48 +0100)
committerRalf Habacker <ralf.habacker@freenet.de>
Mon, 13 Feb 2017 19:22:47 +0000 (20:22 +0100)
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99721
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
cmake/dbus/CMakeLists.txt

index 9f8d9b69b26918acbc9ad43df84d206f5ea229e3..86484a937a90b69f168e1af01e741a208dd5ff9c 100644 (file)
@@ -306,12 +306,8 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
 endif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
 
 install(TARGETS dbus-1 ${INSTALL_TARGETS_DEFAULT_ARGS})
-if(UNIX)
-    install(FILES ${dbusinclude_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dbus-1.0/dbus)
-    install(FILES ${dbusinclude_ARCH_HEADERS} DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbus-1.0/include/dbus)
-else()
-    install(FILES ${dbusinclude_HEADERS} ${dbusinclude_ARCH_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dbus)
-endif()
+install(FILES ${dbusinclude_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dbus-1.0/dbus)
+install(FILES ${dbusinclude_ARCH_HEADERS} DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbus-1.0/include/dbus)
 
 ### Internal library, used for the daemon, tools and tests, compiled statically.