Move the framework related information to the common function

Since the information about framework is performed in multiple places
it's quite hard to control its consistency. This moves the obtaining
of framework related information to the common function and adjusts
the use of the information across the repo.

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

1 files changed, 41 insertions, 11 deletions

diff --git a/cmake/QtFrameworkHelpers.cmake b/cmake/QtFrameworkHelpers.cmake
index 59555522e4..0c6486d362 100644
--- a/cmake/QtFrameworkHelpers.cmake
+++ b/cmake/QtFrameworkHelpers.cmake
@@ -64,12 +64,6 @@ function(qt_copy_framework_headers target)
     set(multiValueArgs)
     cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
-    get_target_property(fw_version ${target} FRAMEWORK_VERSION)
-    get_target_property(fw_bundle_version ${target} MACOSX_FRAMEWORK_BUNDLE_VERSION)
-    get_target_property(fw_dir ${target} LIBRARY_OUTPUT_DIRECTORY)
-    get_target_property(fw_name ${target} OUTPUT_NAME)
-    set(fw_headers_dir ${fw_dir}/${fw_name}.framework/Versions/${fw_version}/Headers/)
-
     # The module name might be different of the actual target name.
     get_target_property(module_interface_name ${target} _qt_module_interface_name)
     if(module_interface_name)
@@ -77,22 +71,28 @@ function(qt_copy_framework_headers target)
     else()
         set(module "Qt${target}")
     endif()
+
+    qt_internal_get_framework_info(fw ${target})
+    set(fw_output_header_dir "${fw_versioned_header_dir}")
     if(ARG_PRIVATE)
-        string(APPEND fw_headers_dir "${fw_bundle_version}/${module}/private/")
+        set(fw_output_header_dir "${fw_private_header_dir}/${module}/private")
     elseif(ARG_QPA)
-        string(APPEND fw_headers_dir "${fw_bundle_version}/${module}/qpa/")
+        set(fw_output_header_dir "${fw_private_header_dir}/${module}/qpa")
     endif()
 
+    get_target_property(output_dir ${target} LIBRARY_OUTPUT_DIRECTORY)
+    set(fw_output_header_dir "${output_dir}/${fw_output_header_dir}")
+
     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_headers_dir}${in_file_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_headers_dir}"
-            COMMAND ${CMAKE_COMMAND} -E copy "${in_file_path}" "${fw_headers_dir}")
+            COMMAND ${CMAKE_COMMAND} -E make_directory "${fw_output_header_dir}"
+            COMMAND ${CMAKE_COMMAND} -E copy "${in_file_path}" "${fw_output_header_dir}")
         list(APPEND out_files ${out_file_path})
     endforeach()
 
@@ -132,3 +132,33 @@ function(qt_finalize_framework_headers_copy target)
         add_dependencies(${target} ${target}_framework_headers)
     endif()
 endfunction()
+
+# Collects the framework related information and paths from the target properties.
+# Output variables:
+#    <out_var>_name framework base name, e.g. 'QtCore'.
+#    <out_var>_dir framework base directory, e.g. 'QtCore.framework'.
+#    <out_var>_version framework version, e.g. 'A', 'B' etc.
+#    <out_var>_bundle_version framework bundle version, same as the PROJECT_VERSION, e.g. '6.0.0'.
+#    <out_var>_header_dir top-level header directory, e.g. 'QtCore.framework/Headers'.
+#    <out_var>_versioned_header_dir header directory for specific framework version,
+#        e.g. 'QtCore.framework/Versions/A/Headers'
+#    <out_var>_private_header_dir header directory for the specific framework version and
+#       framework bundle version e.g. 'QtCore.framework/Versions/A/Headers/6.0.0'
+function(qt_internal_get_framework_info out_var target)
+    get_target_property(${out_var}_version ${target} FRAMEWORK_VERSION)
+    get_target_property(${out_var}_bundle_version ${target} MACOSX_FRAMEWORK_BUNDLE_VERSION)
+
+    set(${out_var}_name "Qt${target}")
+    set(${out_var}_dir "${${out_var}_name}.framework")
+    set(${out_var}_header_dir "${${out_var}_dir}/Headers")
+    set(${out_var}_versioned_header_dir "${${out_var}_dir}/Versions/${${out_var}_version}/Headers")
+    set(${out_var}_private_header_dir "${${out_var}_header_dir}/${${out_var}_bundle_version}")
+
+    set(${out_var}_name "${${out_var}_name}" PARENT_SCOPE)
+    set(${out_var}_dir "${${out_var}_dir}" PARENT_SCOPE)
+    set(${out_var}_header_dir "${${out_var}_header_dir}" PARENT_SCOPE)
+    set(${out_var}_version "${${out_var}_version}" PARENT_SCOPE)
+    set(${out_var}_bundle_version "${${out_var}_bundle_version}" PARENT_SCOPE)
+    set(${out_var}_versioned_header_dir "${${out_var}_versioned_header_dir}" PARENT_SCOPE)
+    set(${out_var}_private_header_dir "${${out_var}_private_header_dir}" PARENT_SCOPE)
+endfunction()