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

CMake: fix unity builds of darwin's permission helper

Browse Source 
CMake-3.29 supports unity-building of objc/objcpp. This patch fixes
darwin's permission helper, which includes a source under a preprocessor
define.

Change-Id: I62e2d291c40ad7b1dbb5243eaee9bf8625473041
Pack-to: 6.7 6.6 6.5
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Tim Blechmann 2024-03-25 14:03:54 +08:00
parent fdac1e2205
commit 95dabd0696
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/QtPluginHelpers.cmake
View File

@ -558,6 +558,7 @@ function(qt_internal_add_darwin_permission_plugin permission)
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
${FWFoundation} ${FWFoundation}
NO_UNITY_BUILD # disable unity build: the same file is built with two different preprocessor defines.
) )
# Disable PCH since CMake falls over on single .mm source targets # Disable PCH since CMake falls over on single .mm source targets
@ -598,10 +599,12 @@ function(qt_internal_add_darwin_permission_plugin permission)
) )
if(CMAKE_VERSION VERSION_LESS "3.18") if(CMAKE_VERSION VERSION_LESS "3.18")
set_property(SOURCE "${separate_request_source_file}" PROPERTY GENERATED TRUE) set_property(SOURCE "${separate_request_source_file}" PROPERTY GENERATED TRUE)
set_property(SOURCE "${separate_request_source_file}" PROPERTY SKIP_UNITY_BUILD_INCLUSION TRUE)
endif() endif()
target_sources(${plugin_target} PRIVATE target_sources(${plugin_target} PRIVATE
"$<${separate_request_genex}:${separate_request_source_file}>" "$<${separate_request_genex}:${separate_request_source_file}>"
) )
set_property(TARGET ${plugin_target} APPEND PROPERTY set_property(TARGET ${plugin_target} APPEND PROPERTY
EXPORT_PROPERTIES _qt_darwin_permissison_separate_request EXPORT_PROPERTIES _qt_darwin_permissison_separate_request
) )