Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2017-04-13 14:02:00 +0300
committerMarkus Goetz <markus@woboq.com>2017-04-20 10:39:41 +0300
commit9aeb587d6c51da52adefa64afe9bf6d410b9eff7 (patch)
treea68f5e2345e0d08a6d2f040d8af27c53b8f0728f /src/CMakeLists.txt
parent51041d0f15a8e011652c2c489385b08917834bea (diff)
Require Qt5
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r--src/CMakeLists.txt15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4a7d756d4..1b53279d2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,28 +6,19 @@ set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)
include(QtVersionAbstraction)
setup_qt()
-if(HAVE_QT5 AND NOT BUILD_WITH_QT4)
- if (${Qt5Core_VERSION_MAJOR} EQUAL "5")
- if (${Qt5Core_VERSION_MINOR} EQUAL "4" OR ${Qt5Core_VERSION_MINOR} GREATER 4)
+if (${Qt5Core_VERSION_MAJOR} EQUAL "5")
+ if (${Qt5Core_VERSION_MINOR} EQUAL "6" OR ${Qt5Core_VERSION_MINOR} GREATER 6)
else()
- message(STATUS "If possible compile me with Qt 5.4 or higher.")
+ message(STATUS "If possible compile me with Qt 5.6 or higher.")
endif()
- endif()
-else()
- message(STATUS "If possible compile me with Qt 5.4 or higher.")
endif()
-
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)