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

Utilize NO_UNITY_BUILD arguments instead of manual exclusion

Browse Source 
Unity build is disabled by default for all 3rdparty libraries, so we
don't need to set the manually anymore; and for the plugins we can use
NO_UNITY_BUILD instead.

Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: Ia2f83ae083924d31adf07e7647b34ae6571ed01f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Amir Masoud Abdol 2023-03-09 14:55:58 +01:00
parent f4228163fb
commit cfed658747
11 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdparty/freetype/CMakeLists.txt vendored
View File

@ -73,8 +73,6 @@ qt_internal_add_3rdparty_library(BundledFreetype
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
) )
set_target_properties(BundledFreetype PROPERTIES UNITY_BUILD OFF)
qt_internal_add_3rdparty_header_module(FreetypePrivate qt_internal_add_3rdparty_header_module(FreetypePrivate
EXTERNAL_HEADERS_DIR include EXTERNAL_HEADERS_DIR include
) )

2
src/3rdparty/harfbuzz-ng/CMakeLists.txt vendored
View File

@ -76,8 +76,6 @@ qt_internal_add_3rdparty_library(BundledHarfbuzz
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/harfbuzz> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/harfbuzz>
) )
set_target_properties(BundledHarfbuzz PROPERTIES UNITY_BUILD OFF)
qt_internal_add_sync_header_dependencies(BundledHarfbuzz Core) qt_internal_add_sync_header_dependencies(BundledHarfbuzz Core)
# GHS compiler doesn't support the __restrict keyword # GHS compiler doesn't support the __restrict keyword

2
src/3rdparty/libjpeg/CMakeLists.txt vendored
View File

@ -60,8 +60,6 @@ qt_internal_add_3rdparty_library(BundledLibjpeg
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
) )
set_target_properties(BundledLibjpeg PROPERTIES UNITY_BUILD OFF)
qt_internal_add_3rdparty_header_module(JpegPrivate qt_internal_add_3rdparty_header_module(JpegPrivate
EXTERNAL_HEADERS EXTERNAL_HEADERS
src/jpeglib.h src/jpeglib.h

2
src/3rdparty/zlib/CMakeLists.txt vendored
View File

@ -34,8 +34,6 @@ qt_internal_add_3rdparty_library(BundledZLIB
$<TARGET_PROPERTY:Core,INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:Core,INCLUDE_DIRECTORIES>
) )
set_target_properties(BundledZLIB PROPERTIES UNITY_BUILD OFF)
qt_internal_add_sync_header_dependencies(BundledZLIB Core) qt_internal_add_sync_header_dependencies(BundledZLIB Core)
qt_disable_warnings(BundledZLIB) qt_disable_warnings(BundledZLIB)

3
src/plugins/imageformats/ico/CMakeLists.txt
View File

@ -15,6 +15,5 @@ qt_internal_add_plugin(QICOPlugin
Qt::Core Qt::Core
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui
NO_UNITY_BUILD
) )
set_target_properties(QICOPlugin PROPERTIES UNITY_BUILD OFF)

3
src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt
View File

@ -24,6 +24,5 @@ qt_internal_add_plugin(QEglFSX11IntegrationPlugin
X11::X11 X11::X11
X11::XCB X11::XCB
XCB::XCB XCB::XCB
NO_UNITY_BUILD # X11 define clashes
) )
set_target_properties(QEglFSX11IntegrationPlugin PROPERTIES UNITY_BUILD OFF) # X11 define clashes

3
src/plugins/platforms/xcb/CMakeLists.txt
View File

@ -60,10 +60,9 @@ qt_internal_add_module(XcbQpaPrivate
# XCB::XINPUT # special case remove handled below # XCB::XINPUT # special case remove handled below
XCB::XKB XCB::XKB
XKB::XKB XKB::XKB
NO_UNITY_BUILD # X11 define clashes
) )
set_target_properties(XcbQpaPrivate PROPERTIES UNITY_BUILD OFF) # X11 define clashes
qt_disable_apple_app_extension_api_only(XcbQpaPrivate) qt_disable_apple_app_extension_api_only(XcbQpaPrivate)
## Scopes: ## Scopes:

3
src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt
View File

@ -28,6 +28,5 @@ qt_internal_add_plugin(QXcbEglIntegrationPlugin
Qt::GuiPrivate Qt::GuiPrivate
Qt::XcbQpaPrivate Qt::XcbQpaPrivate
EGL::EGL EGL::EGL
NO_UNITY_BUILD # X11 define clashes
) )
set_target_properties(QXcbEglIntegrationPlugin PROPERTIES UNITY_BUILD OFF) # X11 define clashes

3
src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
View File

@ -25,10 +25,9 @@ qt_internal_add_plugin(QXcbGlxIntegrationPlugin
Qt::Gui Qt::Gui
Qt::GuiPrivate Qt::GuiPrivate
Qt::XcbQpaPrivate Qt::XcbQpaPrivate
NO_UNITY_BUILD # X11 define clashes
) )
set_target_properties(QXcbGlxIntegrationPlugin PROPERTIES UNITY_BUILD OFF) # X11 define clashes
## Scopes: ## Scopes:
##################################################################### #####################################################################

3
src/tools/bootstrap/CMakeLists.txt
View File

@ -108,6 +108,7 @@ qt_internal_extend_target(Bootstrap
../../corelib/global ../../corelib/global
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Platform Qt::Platform
NO_UNITY_BUILD
) )
## Scopes: ## Scopes:
@ -226,7 +227,7 @@ qt_internal_extend_target(Bootstrap CONDITION MINGW AND WIN32
target_link_libraries(Bootstrap PRIVATE PlatformCommonInternal) target_link_libraries(Bootstrap PRIVATE PlatformCommonInternal)
qt_internal_apply_gc_binaries(Bootstrap PUBLIC) qt_internal_apply_gc_binaries(Bootstrap PUBLIC)
set_target_properties(Bootstrap PROPERTIES AUTOMOC OFF AUTOUIC OFF AUTORCC OFF UNITY_BUILD OFF) set_target_properties(Bootstrap PROPERTIES AUTOMOC OFF AUTOUIC OFF AUTORCC OFF)
qt_internal_add_target_aliases(Bootstrap) qt_internal_add_target_aliases(Bootstrap)
qt_set_msvc_cplusplus_options(Bootstrap PUBLIC) qt_set_msvc_cplusplus_options(Bootstrap PUBLIC)
qt_set_common_target_properties(Bootstrap) qt_set_common_target_properties(Bootstrap)

5
src/tools/tracegen/CMakeLists.txt
View File

@ -19,9 +19,6 @@ qt_internal_add_tool(${target_name}
provider.cpp provider.h provider.cpp provider.h
qtheaders.cpp qtheaders.h qtheaders.cpp qtheaders.h
tracegen.cpp tracegen.cpp
NO_UNITY_BUILD
) )
qt_internal_return_unless_building_tools() qt_internal_return_unless_building_tools()
set_target_properties(${target_name} PROPERTIES
UNITY_BUILD OFF
)