From 80ecaf65fb31267ec9b04fa254e1ffb9b485a771 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sun, 6 Aug 2023 12:58:45 +0200 Subject: [PATCH] cmake helpers: support NO_PCH_SOURCES wherever NO_UNITY_BUILD_SOURCES are The former implies the latter, so it makes little sense to treat them differently. Even if some types of targets are (currently) never compiled with PCH, users of qt_internal_all_x() shouldn't need to know such details. Change-Id: I8ead238a8d9e55da632b2929638b67724a42d73c Reviewed-by: Alexey Edelev (cherry picked from commit 51b3269eef20a6559f6f055ae4897ee7d6fe1f08) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtAppHelpers.cmake | 1 + cmake/QtBuild.cmake | 1 + cmake/QtExecutableHelpers.cmake | 1 + cmake/QtModuleHelpers.cmake | 1 - cmake/QtPluginHelpers.cmake | 2 ++ cmake/QtTargetHelpers.cmake | 1 - cmake/QtToolHelpers.cmake | 1 + 7 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/QtAppHelpers.cmake b/cmake/QtAppHelpers.cmake index 4be5c7d5fef..c0ad53ab9e2 100644 --- a/cmake/QtAppHelpers.cmake +++ b/cmake/QtAppHelpers.cmake @@ -53,6 +53,7 @@ function(qt_internal_add_app target) ${arg_NO_UNITY_BUILD} ${forward_install_dir} SOURCES ${arg_SOURCES} + NO_PCH_SOURCES ${arg_NO_PCH_SOURCES} NO_UNITY_BUILD_SOURCES ${arg_NO_UNITY_BUILD_SOURCES} INCLUDE_DIRECTORIES ${arg_INCLUDE_DIRECTORIES} diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index fa9e61d2033..97aa76fed2a 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -467,6 +467,7 @@ set(__default_private_args DISABLE_AUTOGEN_TOOLS ENABLE_AUTOGEN_TOOLS PLUGIN_TYPES + NO_PCH_SOURCES NO_UNITY_BUILD_SOURCES ) set(__default_public_args diff --git a/cmake/QtExecutableHelpers.cmake b/cmake/QtExecutableHelpers.cmake index 338300d58bb..c863d3f4211 100644 --- a/cmake/QtExecutableHelpers.cmake +++ b/cmake/QtExecutableHelpers.cmake @@ -120,6 +120,7 @@ function(qt_internal_add_executable name) qt_internal_extend_target("${name}" ${arg_NO_UNITY_BUILD} SOURCES ${arg_SOURCES} + NO_PCH_SOURCES ${arg_NO_PCH_SOURCES} NO_UNITY_BUILD_SOURCES ${arg_NO_UNITY_BUILD_SOURCES} INCLUDE_DIRECTORIES ${private_includes} DEFINES ${arg_DEFINES} diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index bd41a3dd061..eeb14f59d5a 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -37,7 +37,6 @@ macro(qt_internal_get_internal_add_module_keywords option_args single_args multi QMAKE_MODULE_CONFIG EXTRA_CMAKE_FILES EXTRA_CMAKE_INCLUDES - NO_PCH_SOURCES EXTERNAL_HEADERS POLICIES ${__default_private_args} diff --git a/cmake/QtPluginHelpers.cmake b/cmake/QtPluginHelpers.cmake index b4aaffb8bbf..2db9d4628a6 100644 --- a/cmake/QtPluginHelpers.cmake +++ b/cmake/QtPluginHelpers.cmake @@ -336,6 +336,8 @@ function(qt_internal_add_plugin target) qt_internal_extend_target("${target}" ${arg_NO_UNITY_BUILD} SOURCES ${arg_SOURCES} + NO_PCH_SOURCES + ${arg_NO_PCH_SOURCES} NO_UNITY_BUILD_SOURCES ${arg_NO_UNITY_BUILD_SOURCES} INCLUDE_DIRECTORIES diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake index 73a076401d8..5e41240fdeb 100644 --- a/cmake/QtTargetHelpers.cmake +++ b/cmake/QtTargetHelpers.cmake @@ -44,7 +44,6 @@ function(qt_internal_extend_target target) CONDITION CONDITION_INDEPENDENT_SOURCES COMPILE_FLAGS - NO_PCH_SOURCES ) cmake_parse_arguments(PARSE_ARGV 1 arg diff --git a/cmake/QtToolHelpers.cmake b/cmake/QtToolHelpers.cmake index 3be629ad678..db18a4dbfda 100644 --- a/cmake/QtToolHelpers.cmake +++ b/cmake/QtToolHelpers.cmake @@ -114,6 +114,7 @@ function(qt_internal_add_tool target_name) NO_INSTALL ${arg_NO_UNITY_BUILD} SOURCES ${arg_SOURCES} + NO_PCH_SOURCES ${arg_NO_PCH_SOURCES} NO_UNITY_BUILD_SOURCES ${arg_NO_UNITY_BUILD_SOURCES} INCLUDE_DIRECTORIES ${arg_INCLUDE_DIRECTORIES}