[PATCH 2/5] Group QT-quick options into one block

Anton Lundin glance at acc.umu.se
Wed Jul 1 08:08:34 PDT 2015


Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
 CMakeLists.txt | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0190cb4..3fe2d87 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -150,13 +150,11 @@ endif()
 
 # configure Qt.
 if(SUBSURFACE_MOBILE)
-	set(QT_QUICK Quick)
-endif()
-find_package(Qt5 REQUIRED COMPONENTS Core Concurrent Widgets Network ${WEBKIT_PKG} PrintSupport Svg Test LinguistTools ${QT_QUICK})
-set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network ${WEBKIT_LIB} Qt5::PrintSupport Qt5::Svg)
-if(SUBSURFACE_MOBILE)
-	set(QT_LIBRARIES ${QT_LIBRARIES} Qt5::Quick)
+	set(QT_QUICK_PKG Quick)
+	set(QT_QUICK_LIB Qt5::Quick)
 endif()
+find_package(Qt5 REQUIRED COMPONENTS Core Concurrent Widgets Network ${WEBKIT_PKG} PrintSupport Svg Test LinguistTools ${QT_QUICK_PKG})
+set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network ${WEBKIT_LIB} Qt5::PrintSupport Qt5::Svg ${QT_QUICK_LIB})
 set(QT_TEST_LIBRARIES ${QT_LIBRARIES} Qt5::Test)
 
 # Generate the ssrf-config.h every 'make'
-- 
2.1.4



More information about the subsurface mailing list