[Pkg-owncloud-commits] [owncloud-client] 309/484: CMake version abstractions: Remove some dependencies.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 6123fab0910fc3f787ea7fb9df8a0d48f8345f5f
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Wed Nov 11 15:24:02 2015 +0100

    CMake version abstractions: Remove some dependencies.
    
    That lets us get rid of the hard dependency on Qt tools which are
    not easily available everywhere.
---
 cmake/modules/QtVersionAbstraction.cmake | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/cmake/modules/QtVersionAbstraction.cmake b/cmake/modules/QtVersionAbstraction.cmake
index d7cbde3..1b744a6 100644
--- a/cmake/modules/QtVersionAbstraction.cmake
+++ b/cmake/modules/QtVersionAbstraction.cmake
@@ -21,8 +21,8 @@ if( Qt5Core_FOUND )
     if(NOT TOKEN_AUTH_ONLY)
         find_package(Qt5WebKitWidgets REQUIRED)
         find_package(Qt5WebKit REQUIRED)
-        find_package(Qt5PrintSupport REQUIRED)
-        find_package(Qt5Quick REQUIRED)
+        find_package(Qt5PrintSupport)
+        find_package(Qt5Quick)
         find_package(Qt5Widgets REQUIRED)
         if(APPLE)
            find_package(Qt5MacExtras REQUIRED)
@@ -74,11 +74,16 @@ endif()
     endmacro()
 
 if(NOT TOKEN_AUTH_ONLY)
-    find_package(Qt5LinguistTools REQUIRED)
-    macro(qt_add_translation)
-	qt5_add_translation(${ARGN})
-    endmacro()
-	else()
+    find_package(Qt5LinguistTools)
+    if(Qt5LinguistTools_FOUND) 
+        macro(qt_add_translation)
+	    qt5_add_translation(${ARGN})
+        endmacro()
+    else()
+         macro(qt_add_translation)
+         endmacro()
+    endif()
+else()
     macro(qt_add_translation)
     endmacro()
 endif()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git