cmake: In generated cmake support files get value for DBus1_INCLUDE_DIRS variable...

This allows cmake to construct the resulting (relocatable) runtime paths.

Fixes dbus/dbus#346

diff --git a/cmake/DBus1Config.cmake.in b/cmake/DBus1Config.cmake.in
index c389d5eaa40ad49140bee23a35d6621a9cc4f0d7..1775b939a52f21e5bb68160beacd3fac886e9c59 100644 (file)
--- a/cmake/DBus1Config.cmake.in
+++ b/cmake/DBus1Config.cmake.in
@@ -26,12 +26,9 @@ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/DBus1Targets.cmake")
         include("${CMAKE_CURRENT_LIST_DIR}/DBus1Targets.cmake")
     endif()
 
-    set(DBus1_INCLUDE_DIRS "${DBus1_INSTALL_DIR}/@CMAKE_INSTALL_INCLUDEDIR@/dbus-1.0" "${DBus1_INSTALL_DIR}/@CMAKE_INSTALL_LIBDIR@/dbus-1.0/include")
     set(DBus1_DEFINITIONS)
-    set(DBus1_LIBRARIES dbus-1)
-
-    set_property(TARGET dbus-1 PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${DBus1_INCLUDE_DIRS})
-    set_property(TARGET dbus-1 PROPERTY INTERFACE_COMPILE_DEFINITIONS ${DBus1_DEFINITIONS})
+    get_target_property(DBus1_INCLUDE_DIRS dbus-1 INTERFACE_INCLUDE_DIRECTORIES)
+    set(DBus1_LIBRARY dbus-1)
 else()
     message(FATAL_ERROR "Incomplete cmake support in DBus1 find_package configuration")
 endif()

diff --git a/dbus/CMakeLists.txt b/dbus/CMakeLists.txt
index a603a1aa15d534a69f9110cc8d586c8455b0096c..e9203ca67c3c4a7142c9abea2553abc720e5a04d 100644 (file)
--- a/dbus/CMakeLists.txt
+++ b/dbus/CMakeLists.txt
@@ -294,6 +294,8 @@ else(WIN32)
     endif()
 endif()
 
+target_include_directories(dbus-1 INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/dbus-1.0>;$<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}/dbus-1.0/include>)
+
 # Assume that Linux has -Wl,--version-script and other platforms do not
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
     set(SOVERSION ${DBUS_LIBRARY_MAJOR})