From 11dcc9018daf87513405262bce5b0de9fbf7013c Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 20 Mar 2025 11:32:55 +0100 Subject: [PATCH] CMake: Add NO_PCH_SOURCES argument to qt_internal_add_cmake_library Forward NO_PCH_SOURCES to qt_internal_extend_target and port to _qt_internal_forward_function_args while we're at it. Change-Id: I0c62e84c5a22f937904c1949ff34d0171a1a937f Reviewed-by: Alexandru Croitor --- cmake/Qt3rdPartyLibraryHelpers.cmake | 41 +++++++++++++++------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/cmake/Qt3rdPartyLibraryHelpers.cmake b/cmake/Qt3rdPartyLibraryHelpers.cmake index 7d97d0e46c4..33bfc3e8348 100644 --- a/cmake/Qt3rdPartyLibraryHelpers.cmake +++ b/cmake/Qt3rdPartyLibraryHelpers.cmake @@ -105,27 +105,30 @@ function(qt_internal_add_cmake_library target) ) endif() + _qt_internal_forward_function_args( + FORWARD_PREFIX arg + FORWARD_OUT_VAR extend_target_args + FORWARD_MULTI + SOURCES + NO_PCH_SOURCES + INCLUDE_DIRECTORIES + SYSTEM_INCLUDE_DIRECTORIES + PUBLIC_INCLUDE_DIRECTORIES + PUBLIC_DEFINES + DEFINES + PUBLIC_LIBRARIES + COMPILE_OPTIONS + PUBLIC_COMPILE_OPTIONS + LINK_OPTIONS + PUBLIC_LINK_OPTIONS + MOC_OPTIONS + ENABLE_AUTOGEN_TOOLS + DISABLE_AUTOGEN_TOOLS + ) + qt_internal_extend_target("${target}" - SOURCES ${arg_SOURCES} - INCLUDE_DIRECTORIES - ${arg_INCLUDE_DIRECTORIES} - SYSTEM_INCLUDE_DIRECTORIES - ${arg_SYSTEM_INCLUDE_DIRECTORIES} - PUBLIC_INCLUDE_DIRECTORIES - ${arg_PUBLIC_INCLUDE_DIRECTORIES} - PUBLIC_DEFINES - ${arg_PUBLIC_DEFINES} - DEFINES - ${arg_DEFINES} - PUBLIC_LIBRARIES ${arg_PUBLIC_LIBRARIES} + ${extend_target_args} LIBRARIES ${arg_LIBRARIES} Qt::PlatformCommonInternal - COMPILE_OPTIONS ${arg_COMPILE_OPTIONS} - PUBLIC_COMPILE_OPTIONS ${arg_PUBLIC_COMPILE_OPTIONS} - LINK_OPTIONS ${arg_LINK_OPTIONS} - PUBLIC_LINK_OPTIONS ${arg_PUBLIC_LINK_OPTIONS} - MOC_OPTIONS ${arg_MOC_OPTIONS} - ENABLE_AUTOGEN_TOOLS ${arg_ENABLE_AUTOGEN_TOOLS} - DISABLE_AUTOGEN_TOOLS ${arg_DISABLE_AUTOGEN_TOOLS} NO_UNITY_BUILD # Disabled by default ) endfunction()