[Pkg-owncloud-commits] [owncloud-client] 130/333: CMake: Do options one directory above

[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 a2467b5dea52414bd1f9142d96f1da618cadb7ad
Author: Markus Goetz <markus at woboq.com>
Date:   Wed Mar 12 14:20:38 2014 +0100

    CMake: Do options one directory above
    
    This fixes linking when keychain was not desired.
---
 CMakeLists.txt     | 21 +++++++++++++++++++--
 src/CMakeLists.txt | 11 -----------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 800407c..f64e078 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,13 +74,30 @@ else()
 endif()
 #####
 
+# this option removes Http authentication, keychain, shibboleth etc and is intended for
+# external authentication mechanisms
+option(TOKEN_AUTH_ONLY "TOKEN_AUTH_ONLY" OFF)
+if(TOKEN_AUTH_ONLY)
+   message("Compiling with token authentication")
+   add_definitions(-DTOKEN_AUTH_ONLY=1)
+endif()
+
+# this option creates only libocsync and libowncloudsync
+option(BUILD_LIBRARIES_ONLY "BUILD_LIBRARIES_ONLY" OFF)
+
 #### find libs
 #find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtXml QtNetwork QtTest QtWebkit REQUIRED )
 #if( UNIX AND NOT APPLE ) # Fdo notifications
 #    find_package(Qt4 4.7.0 COMPONENTS QtDBus REQUIRED )
 #endif()
 find_package(Neon REQUIRED)
-find_package(QtKeychain REQUIRED)
+
+if(NOT TOKEN_AUTH_ONLY)
+	find_package(QtKeychain REQUIRED)
+	set(WITH_QTKEYCHAIN ${QTKEYCHAIN_FOUND})
+else()	
+endif()
+
 Find_package(Sparkle)
 if(UNIX)
 find_package(INotify REQUIRED)
@@ -90,7 +107,7 @@ endif()
 find_package(Sphinx)
 find_package(PdfLatex)
 
-set(WITH_QTKEYCHAIN ${QTKEYCHAIN_FOUND})
+
 
 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 41a495a..3b6409b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,16 +1,5 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
-# this option removes Http authentication, keychain, shibboleth etc and is intended for
-# external authentication mechanisms
-option(TOKEN_AUTH_ONLY "TOKEN_AUTH_ONLY" OFF)
-if(TOKEN_AUTH_ONLY)
-   message("Compiling with token authentication")
-   add_definitions(-DTOKEN_AUTH_ONLY=1)
-endif()
-
-# this option creates only libocsync and libowncloudsync
-option(BUILD_LIBRARIES_ONLY "BUILD_LIBRARIES_ONLY" OFF)
-
 qt_add_resources(MIRALL_RC_SRC ../mirall.qrc)
 if ( IS_DIRECTORY ${OEM_THEME_DIR} )
     qt_add_resources(MIRALL_RC_SRC ${OEM_THEME_DIR}/theme.qrc)

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