fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2025-12-31 13:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'cmake-fixes' into 'master'

Browse source 
cmake: In client configuration file get DBus1_xxx variables from cmake target

See merge request dbus/dbus!499
This commit is contained in:
Simon McVittie 2024-12-10 10:19:57 +00:00
commit 2ff58f5083
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmake/DBus1Config.cmake.in
View file

@ -26,9 +26,10 @@ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/DBus1Targets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/DBus1Targets.cmake")
endif()
set(DBus1_DEFINITIONS)
# for compatibility, get settings from cmake target
get_target_property(DBus1_DEFINITIONS dbus-1 INTERFACE_COMPILE_DEFINITIONS)
get_target_property(DBus1_INCLUDE_DIRS dbus-1 INTERFACE_INCLUDE_DIRECTORIES)
set(DBus1_LIBRARY dbus-1)
get_target_property(DBus1_LIBRARY dbus-1 IMPORTED_IMPLIB)
else()
message(FATAL_ERROR "Incomplete cmake support in DBus1 find_package configuration")
endif()

2
dbus/CMakeLists.txt
View file

@ -299,7 +299,9 @@ else(WIN32)
endif()
endif()
# target definitions passed to the clients
target_include_directories(dbus-1 INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/dbus-1.0>;$<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}/dbus-1.0/include>)
target_compile_definitions(dbus-1 INTERFACE "")
# Assume that Linux has -Wl,--version-script and other platforms do not
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")