From cfed6587476712b67d9de3fd67d708651d827690 Mon Sep 17 00:00:00 2001
From: Amir Masoud Abdol <amir.abdol@qt.io>
Date: Thu, 9 Mar 2023 14:55:58 +0100
Subject: Utilize NO_UNITY_BUILD arguments instead of manual exclusion

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>
---
 src/3rdparty/freetype/CMakeLists.txt    | 2 --
 src/3rdparty/harfbuzz-ng/CMakeLists.txt | 2 --
 src/3rdparty/libjpeg/CMakeLists.txt     | 2 --
 src/3rdparty/zlib/CMakeLists.txt        | 2 --
 4 files changed, 8 deletions(-)

(limited to 'src/3rdparty')

diff --git a/src/3rdparty/freetype/CMakeLists.txt b/src/3rdparty/freetype/CMakeLists.txt
index ac7fb8480b..720a98bee1 100644
--- a/src/3rdparty/freetype/CMakeLists.txt
+++ b/src/3rdparty/freetype/CMakeLists.txt
@@ -73,8 +73,6 @@ 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 1940da9b2b..c761bda388 100644
--- a/src/3rdparty/harfbuzz-ng/CMakeLists.txt
+++ b/src/3rdparty/harfbuzz-ng/CMakeLists.txt
@@ -76,8 +76,6 @@ 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 13e54119be..d1da6c6849 100644
--- a/src/3rdparty/libjpeg/CMakeLists.txt
+++ b/src/3rdparty/libjpeg/CMakeLists.txt
@@ -60,8 +60,6 @@ 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 81fc649538..ee9ece80fc 100644
--- a/src/3rdparty/zlib/CMakeLists.txt
+++ b/src/3rdparty/zlib/CMakeLists.txt
@@ -34,8 +34,6 @@ 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)
-- 
cgit v1.2.3