[Pkg-owncloud-commits] [owncloud-client] 314/470: CMakeLists: move QtKeychain detection in client

[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 fdcdddca167610674a471858975ccf9f229377fa
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Apr 12 14:43:04 2016 +0200

    CMakeLists: move QtKeychain detection in client
---
 CMakeLists.txt     | 8 --------
 src/CMakeLists.txt | 8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 356798a..d8efeb6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,14 +126,6 @@ endif()
 
 find_package(OpenSSL 1.0.0 REQUIRED)
 
-if(NOT TOKEN_AUTH_ONLY)
-    if (Qt5Core_DIR)
-    find_package(Qt5Keychain REQUIRED)
-    else()
-    find_package(QtKeychain REQUIRED)
-    endif()
-endif()
-
 if(APPLE)
   find_package(Sparkle)
 endif(APPLE)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 923c5b3..b287977 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,6 +23,14 @@ if (APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
 endif()
 
+if(NOT TOKEN_AUTH_ONLY)
+    if (Qt5Core_DIR)
+    find_package(Qt5Keychain REQUIRED)
+    else()
+    find_package(QtKeychain REQUIRED)
+    endif()
+endif()
+
 add_subdirectory(libsync)
 if (NOT BUILD_LIBRARIES_ONLY)
     add_subdirectory(gui)

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