diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2021-11-18 15:12:13 +0000 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2021-11-18 15:12:13 +0000 |
| commit | 9b798640a40363cdd1bef5e4d61016df079a37e8 (patch) | |
| tree | 38e339a24f2b6b3699388d176f1ecbf89f7fb50b | |
| parent | e36c7bf707a1fec14b5d256d56aa3db010e24c8c (diff) | |
| parent | a2ccc6773b73520486faa663a1d4da4ba4189b33 (diff) | |
| download | dbus-9b798640a40363cdd1bef5e4d61016df079a37e8.tar.gz | |
Merge branch 'cmake-fix-include-path' into 'master'
cmake: In generated cmake support files get value for DBus1_INCLUDE_DIRS from related cmake target
Closes #346
See merge request dbus/dbus!214
| -rw-r--r-- | cmake/DBus1Config.cmake.in | 7 | ||||
| -rw-r--r-- | dbus/CMakeLists.txt | 2 |
2 files changed, 4 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() diff --git a/dbus/CMakeLists.txt b/dbus/CMakeLists.txt index a603a1aa..e9203ca6 100644 --- 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}) |