1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake helpers: support NO_PCH_SOURCES wherever NO_UNITY_BUILD_SOURCES are

Browse Source 
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 <alexey.edelev@qt.io>
(cherry picked from commit 51b3269eef20a6559f6f055ae4897ee7d6fe1f08)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2023-08-06 12:58:45 +02:00 committed by Qt Cherry-pick Bot
parent 631bcede34
commit 80ecaf65fb
7 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/QtAppHelpers.cmake
View File

@ -53,6 +53,7 @@ function(qt_internal_add_app target)
${arg_NO_UNITY_BUILD} ${arg_NO_UNITY_BUILD}
${forward_install_dir} ${forward_install_dir}
SOURCES ${arg_SOURCES} SOURCES ${arg_SOURCES}
NO_PCH_SOURCES ${arg_NO_PCH_SOURCES}
NO_UNITY_BUILD_SOURCES ${arg_NO_UNITY_BUILD_SOURCES} NO_UNITY_BUILD_SOURCES ${arg_NO_UNITY_BUILD_SOURCES}
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
${arg_INCLUDE_DIRECTORIES} ${arg_INCLUDE_DIRECTORIES}

1
cmake/QtBuild.cmake
View File

@ -467,6 +467,7 @@ set(__default_private_args
DISABLE_AUTOGEN_TOOLS DISABLE_AUTOGEN_TOOLS
ENABLE_AUTOGEN_TOOLS ENABLE_AUTOGEN_TOOLS
PLUGIN_TYPES PLUGIN_TYPES
NO_PCH_SOURCES
NO_UNITY_BUILD_SOURCES NO_UNITY_BUILD_SOURCES
) )
set(__default_public_args set(__default_public_args

1
cmake/QtExecutableHelpers.cmake
View File

@ -120,6 +120,7 @@ function(qt_internal_add_executable name)
qt_internal_extend_target("${name}" qt_internal_extend_target("${name}"
${arg_NO_UNITY_BUILD} ${arg_NO_UNITY_BUILD}
SOURCES ${arg_SOURCES} SOURCES ${arg_SOURCES}
NO_PCH_SOURCES ${arg_NO_PCH_SOURCES}
NO_UNITY_BUILD_SOURCES ${arg_NO_UNITY_BUILD_SOURCES} NO_UNITY_BUILD_SOURCES ${arg_NO_UNITY_BUILD_SOURCES}
INCLUDE_DIRECTORIES ${private_includes} INCLUDE_DIRECTORIES ${private_includes}
DEFINES ${arg_DEFINES} DEFINES ${arg_DEFINES}

1
cmake/QtModuleHelpers.cmake
View File

@ -37,7 +37,6 @@ macro(qt_internal_get_internal_add_module_keywords option_args single_args multi
QMAKE_MODULE_CONFIG QMAKE_MODULE_CONFIG
EXTRA_CMAKE_FILES EXTRA_CMAKE_FILES
EXTRA_CMAKE_INCLUDES EXTRA_CMAKE_INCLUDES
NO_PCH_SOURCES
EXTERNAL_HEADERS EXTERNAL_HEADERS
POLICIES POLICIES
${__default_private_args} ${__default_private_args}

2
cmake/QtPluginHelpers.cmake
View File

@ -336,6 +336,8 @@ function(qt_internal_add_plugin target)
qt_internal_extend_target("${target}" qt_internal_extend_target("${target}"
${arg_NO_UNITY_BUILD} ${arg_NO_UNITY_BUILD}
SOURCES ${arg_SOURCES} SOURCES ${arg_SOURCES}
NO_PCH_SOURCES
${arg_NO_PCH_SOURCES}
NO_UNITY_BUILD_SOURCES NO_UNITY_BUILD_SOURCES
${arg_NO_UNITY_BUILD_SOURCES} ${arg_NO_UNITY_BUILD_SOURCES}
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES

1
cmake/QtTargetHelpers.cmake
View File

@ -44,7 +44,6 @@ function(qt_internal_extend_target target)
CONDITION CONDITION
CONDITION_INDEPENDENT_SOURCES CONDITION_INDEPENDENT_SOURCES
COMPILE_FLAGS COMPILE_FLAGS
NO_PCH_SOURCES
) )
cmake_parse_arguments(PARSE_ARGV 1 arg cmake_parse_arguments(PARSE_ARGV 1 arg

1
cmake/QtToolHelpers.cmake
View File

@ -114,6 +114,7 @@ function(qt_internal_add_tool target_name)
NO_INSTALL NO_INSTALL
${arg_NO_UNITY_BUILD} ${arg_NO_UNITY_BUILD}
SOURCES ${arg_SOURCES} SOURCES ${arg_SOURCES}
NO_PCH_SOURCES ${arg_NO_PCH_SOURCES}
NO_UNITY_BUILD_SOURCES ${arg_NO_UNITY_BUILD_SOURCES} NO_UNITY_BUILD_SOURCES ${arg_NO_UNITY_BUILD_SOURCES}
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
${arg_INCLUDE_DIRECTORIES} ${arg_INCLUDE_DIRECTORIES}