telepathy-qt: CMake/TelepathyQtConfig: Properly lookup for the dependencies

Alexandr Akulich kaffeine at kemper.freedesktop.org
Mon Nov 11 17:28:14 UTC 2019


Module: telepathy-qt
Branch: master
Commit: fb8a651b09c14d8731195a0138c9c7e2f5b045ee
URL:    http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=fb8a651b09c14d8731195a0138c9c7e2f5b045ee

Author: Alexander Akulich <akulichalexander at gmail.com>
Date:   Thu Nov  7 02:25:48 2019 +0300

CMake/TelepathyQtConfig: Properly lookup for the dependencies

---

 TelepathyQt/TelepathyQtConfig.cmake.in | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/TelepathyQt/TelepathyQtConfig.cmake.in b/TelepathyQt/TelepathyQtConfig.cmake.in
index b4b02b05..e841b3ad 100644
--- a/TelepathyQt/TelepathyQtConfig.cmake.in
+++ b/TelepathyQt/TelepathyQtConfig.cmake.in
@@ -12,6 +12,22 @@ if(NOT TelepathyQt at QT_VERSION_MAJOR@_FOUND)
     set(TELEPATHY_QT at QT_VERSION_MAJOR@_VERSION_NANO @TP_QT_NANO_VERSION@)
     set(TELEPATHY_QT at QT_VERSION_MAJOR@_VERSION @PACKAGE_VERSION@)
 
+    # Find the dependencies
+    include(CMakeFindDependencyMacro)
+
+    # Base Qt components set
+    set(_QT_COMPONENTS Core DBus Network)
+
+    if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.9)
+        find_dependency(Qt5 @QT_MINUMUM_VERSION@ COMPONENTS ${_QT_COMPONENTS})
+    else()
+        # Old CMake versions do not support COMPONENTS in find_dependency
+        foreach(_QT_MODULE ${_QT_COMPONENTS})
+            find_dependency(Qt5${_QT_MODULE} @QT_MINUMUM_VERSION@)
+        endforeach()
+    endif()
+    unset(_QT_COMPONENTS)
+
     # set the directories
     if(NOT TELEPATHY_QT at QT_VERSION_MAJOR@_INSTALL_DIR)
         set_and_check(TELEPATHY_QT at QT_VERSION_MAJOR@_INSTALL_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@")



More information about the telepathy-commits mailing list