projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5013eef
)
Simplify CMake code
author
Rolf Eike Beer
<kde@opensource.sf-tec.de>
Fri, 1 Jul 2016 16:47:06 +0000
(18:47 +0200)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Wed, 7 Sep 2016 19:45:49 +0000
(21:45 +0200)
CMakeLists.txt
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
5a1291d
..
2d2fa8c
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-83,7
+83,7
@@
option(WITH_WEBENGINE "WebEngine support (for link previews)" ON)
if (APPLE)
# Notification Center is only available in > 10.8, which is Darwin v12
if (APPLE)
# Notification Center is only available in > 10.8, which is Darwin v12
- if (
CMAKE_SYSTEM_VERSION VERSION_GREATER "11.9.9"
)
+ if (
NOT CMAKE_SYSTEM_VERSION VERSION_LESS 12
)
option(WITH_NOTIFICATION_CENTER "OS X Notification Center support" ON)
add_feature_info(WITH_NOTIFICATION_CENTER WITH_NOTIFICATION_CENTER "Use the OS X Notification Center")
endif()
option(WITH_NOTIFICATION_CENTER "OS X Notification Center support" ON)
add_feature_info(WITH_NOTIFICATION_CENTER WITH_NOTIFICATION_CENTER "Use the OS X Notification Center")
endif()
@@
-154,22
+154,6
@@
endif()
# Set up Qt
#####################################################################
# Set up Qt
#####################################################################
-if (USE_QT5)
- message(STATUS "Building for Qt5...")
- set(QT_MIN_VERSION "5.2.0")
- add_definitions(-DHAVE_QT5)
-else()
- message(STATUS "Building for Qt4...")
- set(QT_MIN_VERSION "4.8.0")
-
- # Select a Qt installation here, if you don't want to use system Qt
- if(QT_PATH)
- # FindQt4 will look for the qmake binary in $PATH, so we just prepend QT_PATH
- set(ENV{PATH} ${QT_PATH}/bin:$ENV{PATH})
- endif()
-endif()
-
-
# Find package dependencies
#
# Note that you can forcefully disable optional packages
# Find package dependencies
#
# Note that you can forcefully disable optional packages
@@
-177,6
+161,10
@@
endif()
#####################################################################
if (USE_QT5)
#####################################################################
if (USE_QT5)
+ message(STATUS "Building for Qt5...")
+ set(QT_MIN_VERSION "5.2.0")
+ add_definitions(-DHAVE_QT5)
+
find_package(Qt5Core ${QT_MIN_VERSION} QUIET)
set_package_properties(Qt5Core PROPERTIES TYPE REQUIRED
URL "http://qt.digia.com"
find_package(Qt5Core ${QT_MIN_VERSION} QUIET)
set_package_properties(Qt5Core PROPERTIES TYPE REQUIRED
URL "http://qt.digia.com"
@@
-380,6
+368,15
@@
if (USE_QT5)
endif()
else(USE_QT5)
endif()
else(USE_QT5)
+ message(STATUS "Building for Qt4...")
+ set(QT_MIN_VERSION "4.8.0")
+
+ # Select a Qt installation here, if you don't want to use system Qt
+ if(QT_PATH)
+ # FindQt4 will look for the qmake binary in $PATH, so we just prepend QT_PATH
+ set(ENV{PATH} ${QT_PATH}/bin:$ENV{PATH})
+ endif()
+
find_package(Qt4 ${QT_MIN_VERSION} QUIET REQUIRED)
if (BUILD_GUI)
find_package(Qt4 ${QT_MIN_VERSION} QUIET REQUIRED)
if (BUILD_GUI)