diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-27 11:26:22 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-16 16:03:06 +0100 |
| commit | 64dc6fe87d05aaad3ce516747ad6dbd048f388cb (patch) | |
| tree | b92970ae773c3553b8e3dcb6f8470689f909e75a /src/3rdparty | |
| parent | 557dcd8a87c6c6c77ccc71a85b1ec349c69eb4c4 (diff) | |
Add some exclusions for CMake Unity (Jumbo) builds
Add exclusions for issues that are likely not fixable
(3rd party code, X11 define clashes, etc) in 3rd party,
tools and plugins.
Pick-to: 6.5
Task-number: QTBUG-109394
Done-with: Amir Masoud Abdol <amir.abdol@qt.io>
Change-Id: I698c004201a76a48389271c130e44fba20f5adf7
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/freetype/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/3rdparty/harfbuzz-ng/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/3rdparty/libjpeg/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/3rdparty/zlib/CMakeLists.txt | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/src/3rdparty/freetype/CMakeLists.txt b/src/3rdparty/freetype/CMakeLists.txt index 720a98bee1..ac7fb8480b 100644 --- a/src/3rdparty/freetype/CMakeLists.txt +++ b/src/3rdparty/freetype/CMakeLists.txt @@ -73,6 +73,8 @@ qt_internal_add_3rdparty_library(BundledFreetype $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> ) +set_target_properties(BundledFreetype PROPERTIES UNITY_BUILD OFF) + qt_internal_add_3rdparty_header_module(FreetypePrivate EXTERNAL_HEADERS_DIR include ) diff --git a/src/3rdparty/harfbuzz-ng/CMakeLists.txt b/src/3rdparty/harfbuzz-ng/CMakeLists.txt index 83566064b3..b18179e6d0 100644 --- a/src/3rdparty/harfbuzz-ng/CMakeLists.txt +++ b/src/3rdparty/harfbuzz-ng/CMakeLists.txt @@ -68,6 +68,8 @@ qt_internal_add_3rdparty_library(BundledHarfbuzz $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/harfbuzz> ) +set_target_properties(BundledHarfbuzz PROPERTIES UNITY_BUILD OFF) + qt_internal_add_sync_header_dependencies(BundledHarfbuzz Core) # GHS compiler doesn't support the __restrict keyword diff --git a/src/3rdparty/libjpeg/CMakeLists.txt b/src/3rdparty/libjpeg/CMakeLists.txt index d1da6c6849..13e54119be 100644 --- a/src/3rdparty/libjpeg/CMakeLists.txt +++ b/src/3rdparty/libjpeg/CMakeLists.txt @@ -60,6 +60,8 @@ qt_internal_add_3rdparty_library(BundledLibjpeg $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src> ) +set_target_properties(BundledLibjpeg PROPERTIES UNITY_BUILD OFF) + qt_internal_add_3rdparty_header_module(JpegPrivate EXTERNAL_HEADERS src/jpeglib.h diff --git a/src/3rdparty/zlib/CMakeLists.txt b/src/3rdparty/zlib/CMakeLists.txt index ee9ece80fc..81fc649538 100644 --- a/src/3rdparty/zlib/CMakeLists.txt +++ b/src/3rdparty/zlib/CMakeLists.txt @@ -34,6 +34,8 @@ qt_internal_add_3rdparty_library(BundledZLIB $<TARGET_PROPERTY:Core,INCLUDE_DIRECTORIES> ) +set_target_properties(BundledZLIB PROPERTIES UNITY_BUILD OFF) + qt_internal_add_sync_header_dependencies(BundledZLIB Core) qt_disable_warnings(BundledZLIB) |