aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorGravatar Tomaz Canabrava <tomaz.canabrava@intel.com>2015-11-20 11:49:56 -0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-12-16 08:00:31 -0800
commitaaafaade5ec645df2b48a3ef8c6e984d95d04636 (patch)
tree4925e294b70d5e5d1c0977edc2580cef9945620f /cmake
parent24f0abe3472306ce76f8644273589cf98b1625cf (diff)
downloadsubsurface-aaafaade5ec645df2b48a3ef8c6e984d95d04636.tar.gz
Use a single variable to handle the extra Qt stuff
It's easier to debug what's wrong this way Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/Modules/HandleFindGrantlee.cmake4
-rw-r--r--cmake/Modules/HandleUserManual.cmake4
2 files changed, 4 insertions, 4 deletions
diff --git a/cmake/Modules/HandleFindGrantlee.cmake b/cmake/Modules/HandleFindGrantlee.cmake
index 0abb763df..ddc253840 100644
--- a/cmake/Modules/HandleFindGrantlee.cmake
+++ b/cmake/Modules/HandleFindGrantlee.cmake
@@ -10,6 +10,6 @@ else()
find_package(Grantlee5 REQUIRED)
set(GRANTLEE_LIBRARIES Grantlee5::Templates)
endif()
- set(PRINTING_PKG PrintSupport)
- set(PRINTING_LIB Qt5::PrintSupport)
+ LIST(APPEND QT_EXTRA_COMPONENTS PrintSupport)
+ LIST(APPEND QT_EXTRA_LIBRARIES Qt5::PrintSupport)
endif()
diff --git a/cmake/Modules/HandleUserManual.cmake b/cmake/Modules/HandleUserManual.cmake
index eeac35c5b..6e4874c60 100644
--- a/cmake/Modules/HandleUserManual.cmake
+++ b/cmake/Modules/HandleUserManual.cmake
@@ -2,6 +2,6 @@ if(NO_USERMANUAL)
message(STATUS "building without usermanual")
add_definitions(-DNO_USERMANUAL)
else()
- set(WEBKIT_PKG WebKitWidgets)
- set(WEBKIT_LIB Qt5::WebKitWidgets)
+ list(APPEND QT_EXTRA_COMPONENTS WebKitWidgets)
+ list(APPEND QT_EXTRA_LIBRARIES Qt5::WebKitWidgets)
endif()