diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2021-11-01 13:01:59 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2021-11-18 13:51:11 +0000 |
| commit | a2ccc6773b73520486faa663a1d4da4ba4189b33 (patch) | |
| tree | 38e339a24f2b6b3699388d176f1ecbf89f7fb50b /cmake | |
| parent | e36c7bf707a1fec14b5d256d56aa3db010e24c8c (diff) | |
| download | dbus-a2ccc6773b73520486faa663a1d4da4ba4189b33.tar.gz | |
cmake: In generated cmake support files get value for DBus1_INCLUDE_DIRS variable from related cmake target
This allows cmake to construct the resulting (relocatable) runtime paths.
Fixes dbus/dbus#346
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/DBus1Config.cmake.in | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cmake/DBus1Config.cmake.in b/cmake/DBus1Config.cmake.in index c389d5ea..1775b939 100644 --- 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() |