0cb2413219
Initially the git vars were assigned to the parent scope of the _qt_internal_sbom_begin_project function, with the intent to set them in the global scope. But the function was later wrapped in other functions, so the variables stopped being accessible. Instead of playing with recursive PARENT_SCOPEs, save the variables in global properties like we do for other info, and use a new _qt_internal_sbom_get_git_version_vars() function to query the vars in the code that needs them. This fixes generated purls to contain the git version and hashes. Also add a new internal API wrapper macro called qt_internal_sbom_get_git_version_vars to allow calling it in other repos. Pick-to: 6.8 Task-number: QTBUG-122899 Change-Id: I061b34f418c1ecc1c66c8c01ef758d2f40611ede Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 41a92bf6f1486259ef25db775520cba647e1cc15) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
108 lines
3.1 KiB
CMake
108 lines
3.1 KiB
CMake
# Copyright (C) 2024 The Qt Company Ltd.
|
|
# SPDX-License-Identifier: BSD-3-Clause
|
|
|
|
# For now these are simple internal forwarding wrappers for the public counterparts, which are
|
|
# meant to be used in qt repo CMakeLists.txt files.
|
|
function(qt_internal_add_sbom)
|
|
_qt_internal_add_sbom(${ARGN})
|
|
endfunction()
|
|
|
|
function(qt_internal_extend_sbom)
|
|
_qt_internal_extend_sbom(${ARGN})
|
|
endfunction()
|
|
|
|
function(qt_internal_sbom_add_license)
|
|
_qt_internal_sbom_add_license(${ARGN})
|
|
endfunction()
|
|
|
|
function(qt_internal_extend_sbom_dependencies)
|
|
_qt_internal_extend_sbom_dependencies(${ARGN})
|
|
endfunction()
|
|
|
|
function(qt_find_package_extend_sbom)
|
|
_qt_find_package_extend_sbom(${ARGN})
|
|
endfunction()
|
|
|
|
function(qt_internal_sbom_begin_qt_repo_project)
|
|
_qt_internal_sbom_begin_qt_repo_project(${ARGN})
|
|
endfunction()
|
|
|
|
function(qt_internal_sbom_end_qt_repo_project)
|
|
_qt_internal_sbom_end_qt_repo_project(${ARGN})
|
|
endfunction()
|
|
|
|
function(qt_internal_sbom_add_files)
|
|
_qt_internal_sbom_add_files(${ARGN})
|
|
endfunction()
|
|
|
|
function(qt_internal_sbom_add_cmake_include_step)
|
|
_qt_internal_sbom_add_cmake_include_step(${ARGN})
|
|
endfunction()
|
|
|
|
function(qt_internal_sbom_add_external_reference)
|
|
_qt_internal_sbom_generate_add_external_reference(${ARGN})
|
|
endfunction()
|
|
|
|
function(qt_internal_sbom_add_project_relationship)
|
|
_qt_internal_sbom_generate_add_project_relationship(${ARGN})
|
|
endfunction()
|
|
|
|
function(qt_internal_sbom_generate_tag_value_spdx_document)
|
|
_qt_internal_sbom_generate_tag_value_spdx_document(${ARGN})
|
|
|
|
set(opt_args "")
|
|
set(single_args
|
|
OUT_VAR_OUTPUT_FILE_NAME
|
|
OUT_VAR_OUTPUT_ABSOLUTE_FILE_PATH
|
|
)
|
|
set(multi_args "")
|
|
cmake_parse_arguments(PARSE_ARGV 0 arg "${opt_args}" "${single_args}" "${multi_args}")
|
|
|
|
if(arg_OUT_VAR_OUTPUT_FILE_NAME)
|
|
set(${arg_OUT_VAR_OUTPUT_FILE_NAME} "${${arg_OUT_VAR_OUTPUT_FILE_NAME}}" PARENT_SCOPE)
|
|
endif()
|
|
|
|
if(arg_OUT_VAR_OUTPUT_ABSOLUTE_FILE_PATH)
|
|
set(${arg_OUT_VAR_OUTPUT_ABSOLUTE_FILE_PATH} "${${arg_OUT_VAR_OUTPUT_ABSOLUTE_FILE_PATH}}"
|
|
PARENT_SCOPE)
|
|
endif()
|
|
endfunction()
|
|
|
|
function(qt_internal_sbom_get_project_spdx_id out_var)
|
|
set(result "")
|
|
|
|
if(QT_GENERATE_SBOM)
|
|
get_cmake_property(project_spdx_id _qt_internal_sbom_project_spdx_id)
|
|
if(project_spdx_id)
|
|
set(result "${project_spdx_id}")
|
|
endif()
|
|
endif()
|
|
|
|
set(${out_var} "${result}" PARENT_SCOPE)
|
|
endfunction()
|
|
|
|
function(qt_internal_sbom_get_target_spdx_id target out_var)
|
|
set(result "")
|
|
|
|
if(QT_GENERATE_SBOM)
|
|
_qt_internal_sbom_get_spdx_id_for_target(${target} result)
|
|
endif()
|
|
|
|
set(${out_var} "${result}" PARENT_SCOPE)
|
|
endfunction()
|
|
|
|
function(qt_internal_sbom_get_external_document_ref_spdx_id project_name out_var)
|
|
set(result "")
|
|
|
|
if(QT_GENERATE_SBOM)
|
|
string(TOLOWER "${project_name}" project_name_lowercase)
|
|
_qt_internal_sbom_get_external_document_ref_spdx_id("${project_name_lowercase}" result)
|
|
endif()
|
|
|
|
set(${out_var} "${result}" PARENT_SCOPE)
|
|
endfunction()
|
|
|
|
macro(qt_internal_sbom_get_git_version_vars)
|
|
_qt_internal_sbom_get_git_version_vars()
|
|
endmacro()
|