From aaafaade5ec645df2b48a3ef8c6e984d95d04636 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Fri, 20 Nov 2015 11:49:56 -0200 Subject: 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 --- cmake/Modules/HandleFindGrantlee.cmake | 4 ++-- cmake/Modules/HandleUserManual.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'cmake/Modules') 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() -- cgit v1.2.3-70-g09d2