CMakeLists: move QtKeychain detection in client

This commit is contained in:
Olivier Goffart 2016-04-12 14:43:04 +02:00
parent bf99306a53
commit fdcdddca16
2 changed files with 8 additions and 8 deletions

View file

@ -126,14 +126,6 @@ endif()
find_package(OpenSSL 1.0.0 REQUIRED) 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) if(APPLE)
find_package(Sparkle) find_package(Sparkle)
endif(APPLE) endif(APPLE)

View file

@ -23,6 +23,14 @@ if (APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
endif() endif()
if(NOT TOKEN_AUTH_ONLY)
if (Qt5Core_DIR)
find_package(Qt5Keychain REQUIRED)
else()
find_package(QtKeychain REQUIRED)
endif()
endif()
add_subdirectory(libsync) add_subdirectory(libsync)
if (NOT BUILD_LIBRARIES_ONLY) if (NOT BUILD_LIBRARIES_ONLY)
add_subdirectory(gui) add_subdirectory(gui)