[cmake] FindDBus move to full TARGET usage

6 files changed, 30 insertions, 38 deletions

diff --git a/cmake/modules/FindDBus.cmake b/cmake/modules/FindDBus.cmake
index df3edc5180..cec6a6af8d 100644
--- a/cmake/modules/FindDBus.cmake
+++ b/cmake/modules/FindDBus.cmake
@@ -3,50 +3,42 @@
 # -------
 # Finds the DBUS library
 #
-# This will define the following variables::
-#
-# DBUS_FOUND - system has DBUS
-# DBUS_INCLUDE_DIRS - the DBUS include directory
-# DBUS_LIBRARIES - the DBUS libraries
-# DBUS_DEFINITIONS - the DBUS definitions
-#
-# and the following imported targets::
+# This will define the following target:
 #
 #   DBus::DBus   - The DBUS library
 
-if(PKG_CONFIG_FOUND)
-  pkg_check_modules(PC_DBUS dbus-1 QUIET)
-endif()
+if(NOT TARGET DBus::DBus)
+  find_package(PkgConfig)
+  if(PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_DBUS dbus-1 QUIET)
+  endif()
 
-find_path(DBUS_INCLUDE_DIR NAMES dbus/dbus.h
-                           PATH_SUFFIXES dbus-1.0
-                           PATHS ${PC_DBUS_INCLUDE_DIR})
-find_path(DBUS_ARCH_INCLUDE_DIR NAMES dbus/dbus-arch-deps.h
-                                PATH_SUFFIXES dbus-1.0/include
-                                PATHS ${PC_DBUS_LIBDIR}
-                                      /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE})
-find_library(DBUS_LIBRARY NAMES dbus-1
-                          PATHS ${PC_DBUS_LIBDIR})
+  find_path(DBUS_INCLUDE_DIR NAMES dbus/dbus.h
+                             PATH_SUFFIXES dbus-1.0
+                             PATHS ${PC_DBUS_INCLUDE_DIR})
+  find_path(DBUS_ARCH_INCLUDE_DIR NAMES dbus/dbus-arch-deps.h
+                                  PATH_SUFFIXES dbus-1.0/include
+                                  PATHS ${PC_DBUS_LIBDIR}
+                                        /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE})
+  find_library(DBUS_LIBRARY NAMES dbus-1
+                            PATHS ${PC_DBUS_LIBDIR})
 
-set(DBUS_VERSION ${PC_DBUS_VERSION})
+  set(DBUS_VERSION ${PC_DBUS_VERSION})
 
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(DBus
-                                  REQUIRED_VARS DBUS_LIBRARY DBUS_INCLUDE_DIR DBUS_ARCH_INCLUDE_DIR
-                                  VERSION_VAR DBUS_VERSION)
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(DBus
+                                    REQUIRED_VARS DBUS_LIBRARY DBUS_INCLUDE_DIR DBUS_ARCH_INCLUDE_DIR
+                                    VERSION_VAR DBUS_VERSION)
 
-if(DBUS_FOUND)
-  set(DBUS_LIBRARIES ${DBUS_LIBRARY})
-  set(DBUS_INCLUDE_DIRS ${DBUS_INCLUDE_DIR} ${DBUS_ARCH_INCLUDE_DIR})
-  set(DBUS_DEFINITIONS -DHAS_DBUS=1)
+  if(DBUS_FOUND)
 
-  if(NOT TARGET DBus::DBus)
     add_library(DBus::DBus UNKNOWN IMPORTED)
     set_target_properties(DBus::DBus PROPERTIES
                                    IMPORTED_LOCATION "${DBUS_LIBRARY}"
-                                   INTERFACE_INCLUDE_DIRECTORIES "${DBUS_INCLUDE_DIR}"
+                                   INTERFACE_INCLUDE_DIRECTORIES "${DBUS_INCLUDE_DIR};${DBUS_ARCH_INCLUDE_DIR}"
                                    INTERFACE_COMPILE_DEFINITIONS HAS_DBUS=1)
+    set_property(GLOBAL APPEND PROPERTY INTERNAL_DEPS_PROP DBus::DBus)
   endif()
-endif()
 
-mark_as_advanced(DBUS_INCLUDE_DIR DBUS_LIBRARY)
+  mark_as_advanced(DBUS_INCLUDE_DIR DBUS_LIBRARY)
+endif()
diff --git a/xbmc/platform/freebsd/CMakeLists.txt b/xbmc/platform/freebsd/CMakeLists.txt
index 9b8782f4cd..1c045d2ab7 100644
--- a/xbmc/platform/freebsd/CMakeLists.txt
+++ b/xbmc/platform/freebsd/CMakeLists.txt
@@ -18,7 +18,7 @@ if(ALSA_FOUND)
   list(APPEND HEADERS ../linux/FDEventMonitor.h)
 endif()
 
-if(DBUS_FOUND)
+if(TARGET DBus::DBus)
   list(APPEND SOURCES ../linux/DBusMessage.cpp
                       ../linux/DBusUtil.cpp)
   list(APPEND HEADERS ../linux/DBusMessage.h
diff --git a/xbmc/platform/linux/CMakeLists.txt b/xbmc/platform/linux/CMakeLists.txt
index 54a3b25d28..7292690c04 100644
--- a/xbmc/platform/linux/CMakeLists.txt
+++ b/xbmc/platform/linux/CMakeLists.txt
@@ -23,7 +23,7 @@ if(ALSA_FOUND)
   list(APPEND HEADERS FDEventMonitor.h)
 endif()
 
-if(DBUS_FOUND)
+if(TARGET DBus::DBus)
   list(APPEND SOURCES DBusMessage.cpp
                       DBusUtil.cpp)
   list(APPEND HEADERS DBusMessage.h
diff --git a/xbmc/platform/linux/powermanagement/CMakeLists.txt b/xbmc/platform/linux/powermanagement/CMakeLists.txt
index 3694a7967e..6870f83928 100644
--- a/xbmc/platform/linux/powermanagement/CMakeLists.txt
+++ b/xbmc/platform/linux/powermanagement/CMakeLists.txt
@@ -3,7 +3,7 @@ set(SOURCES LinuxPowerSyscall.cpp)
 set(HEADERS FallbackPowerSyscall.h
             LinuxPowerSyscall.h)
 
-if(DBUS_FOUND)
+if(TARGET DBus::DBus)
   list(APPEND SOURCES ConsoleUPowerSyscall.cpp
                       LogindUPowerSyscall.cpp
                       UPowerSyscall.cpp)
diff --git a/xbmc/platform/linux/storage/CMakeLists.txt b/xbmc/platform/linux/storage/CMakeLists.txt
index 223655aef6..322ee5cffd 100644
--- a/xbmc/platform/linux/storage/CMakeLists.txt
+++ b/xbmc/platform/linux/storage/CMakeLists.txt
@@ -2,7 +2,7 @@ set(SOURCES LinuxStorageProvider.cpp)
 
 set(HEADERS LinuxStorageProvider.h)
 
-if(DBUS_FOUND)
+if(TARGET DBus::DBus)
   list(APPEND SOURCES UDisksProvider.cpp
                       UDisks2Provider.cpp)
   list(APPEND HEADERS UDisksProvider.h
diff --git a/xbmc/windowing/linux/CMakeLists.txt b/xbmc/windowing/linux/CMakeLists.txt
index 2a36d63120..7b002c22da 100644
--- a/xbmc/windowing/linux/CMakeLists.txt
+++ b/xbmc/windowing/linux/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(SOURCES "")
 set(HEADERS "")
 
-if(DBUS_FOUND)
+if(TARGET DBus::DBus)
   list(APPEND SOURCES OSScreenSaverFreedesktop.cpp)
   list(APPEND HEADERS OSScreenSaverFreedesktop.h)
 endif()