From 8f03bb6bd8ad2d59e0043d26a0470faf42e98093 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 21 May 2024 17:19:55 +0200 Subject: [PATCH] CMake: Set fw_versioned_binary_dir in the framework info function This will be used by the SBOM generation code to retrieve the directory where the framework file is installed. Change-Id: I882344f1fa3c5a77e3cce85d2044aa0e682bed40 Reviewed-by: Alexey Edelev --- cmake/QtFrameworkHelpers.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cmake/QtFrameworkHelpers.cmake b/cmake/QtFrameworkHelpers.cmake index 750caf2cb8b..8f429d7ad44 100644 --- a/cmake/QtFrameworkHelpers.cmake +++ b/cmake/QtFrameworkHelpers.cmake @@ -185,6 +185,8 @@ endfunction() # _version framework version, e.g. 'A', 'B' etc. # _bundle_version framework bundle version, same as the PROJECT_VERSION, e.g. '6.0.0'. # _header_dir top-level header directory, e.g. 'QtCore.framework/Headers'. +# _versioned_binary_dir versioned directory that contains the framework binary, +# e.g. 'QtCore.framework/Versions/A' # _versioned_header_dir header directory for specific framework version, # e.g. 'QtCore.framework/Versions/A/Headers' # _private_header_dir header directory for the specific framework version and @@ -208,11 +210,14 @@ function(qt_internal_get_framework_info out_var target) set(${out_var}_name "${module}") set(${out_var}_dir "${${out_var}_name}.framework") set(${out_var}_header_dir "${${out_var}_dir}/Headers") + if(UIKIT) - # iOS frameworks do not version their headers + # iOS frameworks do not have a Versions sub-directory + set(${out_var}_versioned_binary_dir "${${out_var}_dir}}") set(${out_var}_versioned_header_dir "${${out_var}_header_dir}") else() - set(${out_var}_versioned_header_dir "${${out_var}_dir}/Versions/${${out_var}_version}/Headers") + set(${out_var}_versioned_binary_dir "${${out_var}_dir}/Versions/${${out_var}_version}") + set(${out_var}_versioned_header_dir "${${out_var}_versioned_binary_dir}/Headers") endif() set(${out_var}_private_header_dir "${${out_var}_versioned_header_dir}/${${out_var}_bundle_version}") set(${out_var}_private_module_header_dir "${${out_var}_private_header_dir}/${module}") @@ -222,6 +227,7 @@ function(qt_internal_get_framework_info out_var target) 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_binary_dir "${${out_var}_versioned_binary_dir}" 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) set(${out_var}_private_module_header_dir "${${out_var}_private_module_header_dir}" PARENT_SCOPE)