diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-03-15 10:46:22 +0100 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-03-15 18:18:01 +0100 |
| commit | cd12c1f33281452d478bb94744d76bead5c7363a (patch) | |
| tree | a333bbe830f95f75d5c1bd9b51922d236183b459 /cmake/QtExecutableHelpers.cmake | |
| parent | 11ae4b70a164ee2d7d9894302b12574773a3e57b (diff) | |
Fix an issue with passing NO_UNITY_BUILD_SOURCES
Amend 31518f1a4e3c4a7c77ae2e008e903a849ba75dd6
Amend 360293623094a31586981206e59c92aa6235163d
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: Ibb2fd881c02b6496f06b8b623fa6009358755a26
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtExecutableHelpers.cmake')
| -rw-r--r-- | cmake/QtExecutableHelpers.cmake | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cmake/QtExecutableHelpers.cmake b/cmake/QtExecutableHelpers.cmake index bd41c474eb..5efeb2a245 100644 --- a/cmake/QtExecutableHelpers.cmake +++ b/cmake/QtExecutableHelpers.cmake @@ -111,11 +111,17 @@ function(qt_internal_add_executable name) endif() if(arg_NO_UNITY_BUILD) - set(arg_NO_UNITY_BUILD NO_UNITY_BUILD) + set(arg_NO_UNITY_BUILD "NO_UNITY_BUILD") else() set(arg_NO_UNITY_BUILD "") endif() + if(arg_NO_UNITY_BUILD_SOURCES) + set(arg_NO_UNITY_BUILD_SOURCES "NO_UNITY_BUILD_SOURCES ${arg_NO_UNITY_BUILD_SOURCES}") + else() + set(arg_NO_UNITY_BUILD_SOURCES "") + endif() + qt_internal_extend_target("${name}" SOURCES ${arg_SOURCES} INCLUDE_DIRECTORIES ${private_includes} @@ -134,7 +140,7 @@ function(qt_internal_add_executable name) MOC_OPTIONS ${arg_MOC_OPTIONS} ENABLE_AUTOGEN_TOOLS ${arg_ENABLE_AUTOGEN_TOOLS} DISABLE_AUTOGEN_TOOLS ${arg_DISABLE_AUTOGEN_TOOLS} - NO_UNITY_BUILD_SOURCES ${arg_NO_UNITY_BUILD_SOURCES} + ${arg_NO_UNITY_BUILD_SOURCES} ${arg_NO_UNITY_BUILD} ) set_target_properties("${name}" PROPERTIES |