Allow specifying multiple header types in qt_copy_framework_headers

qt_copy_framework_headers now can accept all the headers in one call.
This is useful for upcoming changes when it will accept generator
expressions as the input instead of actual files.

Change-Id: I110b6d9e6de976b2a7581902e051e38571716c5f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

2 files changed, 31 insertions, 38 deletions

diff --git a/cmake/QtFrameworkHelpers.cmake b/cmake/QtFrameworkHelpers.cmake
index 98145302c6..c90e2c1623 100644
--- a/cmake/QtFrameworkHelpers.cmake
+++ b/cmake/QtFrameworkHelpers.cmake
@@ -64,42 +64,37 @@ function(qt_copy_framework_headers target)
         return()
     endif()
 
-    set(options PUBLIC PRIVATE QPA)
+    set(options)
     set(oneValueArgs)
-    set(multiValueArgs)
-    cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+    set(multiValueArgs PUBLIC PRIVATE QPA)
+    cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
     qt_internal_get_framework_info(fw ${target})
-    set(fw_output_header_dir "${fw_versioned_header_dir}")
-    if(ARG_PRIVATE)
-        set(fw_output_header_dir "${fw_private_module_header_dir}/private")
-    elseif(ARG_QPA)
-        set(fw_output_header_dir "${fw_private_module_header_dir}/qpa")
-    endif()
-
     get_target_property(output_dir ${target} LIBRARY_OUTPUT_DIRECTORY)
-    set(fw_output_header_dir "${output_dir}/${fw_output_header_dir}")
+    set(output_dir_PUBLIC "${output_dir}/${fw_versioned_header_dir}")
+    set(output_dir_PRIVATE "${output_dir}/${fw_private_module_header_dir}/private")
+    set(output_dir_QPA "${output_dir}/${fw_private_module_header_dir}/qpa")
+
 
     set(out_files)
-    foreach(hdr IN LISTS ARG_UNPARSED_ARGUMENTS)
-        get_filename_component(in_file_path ${hdr} ABSOLUTE)
-        get_filename_component(in_file_name ${hdr} NAME)
-        set(out_file_path "${fw_output_header_dir}/${in_file_name}")
-        add_custom_command(
-            OUTPUT ${out_file_path}
-            DEPENDS ${in_file_path}
-            COMMAND ${CMAKE_COMMAND} -E make_directory "${fw_output_header_dir}"
-            COMMAND ${CMAKE_COMMAND} -E copy "${in_file_path}" "${fw_output_header_dir}"
-            VERBATIM)
-        list(APPEND out_files ${out_file_path})
+    foreach(type IN ITEMS PUBLIC PRIVATE QPA)
+        set(fw_output_header_dir "${output_dir_${type}}")
+        foreach(hdr IN LISTS arg_${type})
+            get_filename_component(in_file_path ${hdr} ABSOLUTE)
+            get_filename_component(in_file_name ${hdr} NAME)
+            set(out_file_path "${fw_output_header_dir}/${in_file_name}")
+            add_custom_command(
+                OUTPUT ${out_file_path}
+                DEPENDS ${in_file_path}
+                COMMAND ${CMAKE_COMMAND} -E make_directory "${fw_output_header_dir}"
+                COMMAND ${CMAKE_COMMAND} -E copy "${in_file_path}" "${fw_output_header_dir}"
+                VERBATIM)
+            list(APPEND out_files ${out_file_path})
+        endforeach()
     endforeach()
 
-    get_target_property(fw_copied_headers ${target} QT_COPIED_FRAMEWORK_HEADERS)
-    if(NOT fw_copied_headers)
-        set(fw_copied_headers "")
-    endif()
-    list(APPEND fw_copied_headers ${out_files})
-    set_target_properties(${target} PROPERTIES QT_COPIED_FRAMEWORK_HEADERS "${fw_copied_headers}")
+    set_property(TARGET ${target} APPEND PROPERTY
+        QT_COPIED_FRAMEWORK_HEADERS "${out_files}")
 endfunction()
 
 function(qt_finalize_framework_headers_copy target)
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake
index 6fa05e4ddf..7c418dfb71 100644
--- a/cmake/QtModuleHelpers.cmake
+++ b/cmake/QtModuleHelpers.cmake
@@ -403,9 +403,11 @@ function(qt_internal_add_module target)
             "${module_build_interface_include_dir}/${module_include_name}Depends")
         if(is_framework)
             if(NOT is_interface_lib)
-                set(public_headers_to_copy "${module_headers_public}" "${module_depends_header}")
-                qt_copy_framework_headers(${target} PUBLIC "${public_headers_to_copy}")
-                qt_copy_framework_headers(${target} PRIVATE "${module_headers_private}")
+                qt_copy_framework_headers(${target}
+                    PUBLIC "${module_headers_public};${module_depends_header}"
+                    PRIVATE "${module_headers_private}"
+                    QPA "${module_headers_qpa}"
+                )
             endif()
         else()
             set_property(TARGET ${target} APPEND PROPERTY PUBLIC_HEADER "${module_headers_public}")
@@ -418,13 +420,9 @@ function(qt_internal_add_module target)
         endif()
 
         if(module_headers_qpa)
-            if(is_framework)
-                qt_copy_framework_headers(${target} QPA "${module_headers_qpa}")
-            else()
-                qt_install(
-                    FILES ${module_headers_qpa}
-                    DESTINATION "${module_install_interface_qpa_include_dir}")
-            endif()
+            qt_install(
+                FILES ${module_headers_qpa}
+                DESTINATION "${module_install_interface_qpa_include_dir}")
         endif()
     endif()