From 74e927855385d46d53ce13460d4d72ad605b1dae Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 8 Nov 2018 22:29:54 +0100 Subject: CMake: Simplify registration of known Qt targets Change-Id: Ibd7b5f628c0a1a3087bdfebb0c35242b42c5e938 Reviewed-by: Frederik Gladhorn --- cmake/QtBuild.cmake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'cmake') diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index ee910155dd..0081f064ec 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -67,9 +67,12 @@ set(QT_PLATFORM_DEFINITION_DIR ${QT_DEFAULT_PLATFORM_DEFINITION_DIR} CACHE PATH "Path to directory that contains qplatformdefs.h") set(QT_NAMESPACE "" CACHE STRING "Qt Namespace") -# Reset: -set(KNOWN_QT_MODULES "" CACHE INTERNAL "Known Qt modules" FORCE) +macro(_set_known_qt_modules) + set(KNOWN_QT_MODULES ${ARGN} CACHE INTERNAL "Known Qt modules" FORCE) +endmacro() +# Reset: +_set_known_qt_modules("") # For adjusting variables when running tests, we need to know what # the correct variable is for separating entries in PATH-alike @@ -531,8 +534,7 @@ function(add_qt_module name) string(TOUPPER "${name}" name_upper) string(TOLOWER "${name}" name_lower) - set(known_modules "${KNOWN_QT_MODULES}" "${target}") - set(KNOWN_QT_MODULES ${known_modules} CACHE INTERNAL "Modules that are built." FORCE) + _set_known_qt_modules("${KNOWN_QT_MODULES}" "${target}") ### Define Targets: if(${_arg_STATIC}) -- cgit v1.2.3