1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Prepend underscore to qt_internal_sbom_set_default_option_value

Browse Source 
Because it's in a Public cmake file.

Pick-to: 6.8 6.9
Task-number: QTBUG-122899
Change-Id: If3f92af848193cb824b88e93e17965ffed93cf2b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexandru Croitor 2025-01-10 16:41:33 +01:00
parent ff68e05bc3
commit 4be604c55e
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
cmake/QtPublicSbomGenerationHelpers.cmake
View File

@ -3,7 +3,7 @@
# SPDX-License-Identifier: MIT AND BSD-3-Clause # SPDX-License-Identifier: MIT AND BSD-3-Clause
# Helper to set a single arg option to a default value if not set. # Helper to set a single arg option to a default value if not set.
function(qt_internal_sbom_set_default_option_value option_name default) function(_qt_internal_sbom_set_default_option_value option_name default)
if(NOT arg_${option_name}) if(NOT arg_${option_name})
set(arg_${option_name} "${default}" PARENT_SCOPE) set(arg_${option_name} "${default}" PARENT_SCOPE)
endif() endif()
@ -11,8 +11,8 @@ endfunction()
# Helper to set a single arg option to a default value if not set. # Helper to set a single arg option to a default value if not set.
# Errors out if the end value is empty. Including if the default value was empty. # Errors out if the end value is empty. Including if the default value was empty.
function(qt_internal_sbom_set_default_option_value_and_error_if_empty option_name default) function(_qt_internal_sbom_set_default_option_value_and_error_if_empty option_name default)
qt_internal_sbom_set_default_option_value("${option_name}" "${default}") _qt_internal_sbom_set_default_option_value("${option_name}" "${default}")
if(NOT arg_${option_name}) if(NOT arg_${option_name})
message(FATAL_ERROR "Specifying a non-empty ${option_name} is required") message(FATAL_ERROR "Specifying a non-empty ${option_name} is required")
endif() endif()
@ -76,7 +76,7 @@ function(_qt_internal_sbom_begin_project_generate)
string(TIMESTAMP current_utc UTC) string(TIMESTAMP current_utc UTC)
string(TIMESTAMP current_year "%Y" UTC) string(TIMESTAMP current_year "%Y" UTC)
qt_internal_sbom_set_default_option_value(PROJECT "${PROJECT_NAME}") _qt_internal_sbom_set_default_option_value(PROJECT "${PROJECT_NAME}")
_qt_internal_sbom_get_git_version_vars() _qt_internal_sbom_get_git_version_vars()
@ -85,17 +85,17 @@ function(_qt_internal_sbom_begin_project_generate)
set(default_install_sbom_path set(default_install_sbom_path
"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/${default_sbom_file_name}") "\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/${default_sbom_file_name}")
qt_internal_sbom_set_default_option_value(OUTPUT "${default_install_sbom_path}") _qt_internal_sbom_set_default_option_value(OUTPUT "${default_install_sbom_path}")
qt_internal_sbom_set_default_option_value(OUTPUT_RELATIVE_PATH _qt_internal_sbom_set_default_option_value(OUTPUT_RELATIVE_PATH
"${default_sbom_file_name}") "${default_sbom_file_name}")
qt_internal_sbom_set_default_option_value(LICENSE "NOASSERTION") _qt_internal_sbom_set_default_option_value(LICENSE "NOASSERTION")
qt_internal_sbom_set_default_option_value(PROJECT_FOR_SPDX_ID "Package-${arg_PROJECT}") _qt_internal_sbom_set_default_option_value(PROJECT_FOR_SPDX_ID "Package-${arg_PROJECT}")
qt_internal_sbom_set_default_option_value_and_error_if_empty(SUPPLIER "") _qt_internal_sbom_set_default_option_value_and_error_if_empty(SUPPLIER "")
qt_internal_sbom_set_default_option_value(COPYRIGHT "${current_year} ${arg_SUPPLIER}") _qt_internal_sbom_set_default_option_value(COPYRIGHT "${current_year} ${arg_SUPPLIER}")
qt_internal_sbom_set_default_option_value_and_error_if_empty(SUPPLIER_URL _qt_internal_sbom_set_default_option_value_and_error_if_empty(SUPPLIER_URL
"${PROJECT_HOMEPAGE_URL}") "${PROJECT_HOMEPAGE_URL}")
qt_internal_sbom_set_default_option_value(NAMESPACE _qt_internal_sbom_set_default_option_value(NAMESPACE
"${arg_SUPPLIER}/spdxdocs/${arg_PROJECT}-${QT_SBOM_GIT_VERSION}") "${arg_SUPPLIER}/spdxdocs/${arg_PROJECT}-${QT_SBOM_GIT_VERSION}")
if(arg_CPE) if(arg_CPE)
@ -123,7 +123,7 @@ function(_qt_internal_sbom_begin_project_generate)
set(cmake_configs "${CMAKE_BUILD_TYPE}") set(cmake_configs "${CMAKE_BUILD_TYPE}")
endif() endif()
qt_internal_sbom_set_default_option_value(DOWNLOAD_LOCATION "NOASSERTION") _qt_internal_sbom_set_default_option_value(DOWNLOAD_LOCATION "NOASSERTION")
set(cmake_version "Built by CMake ${CMAKE_VERSION}") set(cmake_version "Built by CMake ${CMAKE_VERSION}")
set(system_name_and_processor "${CMAKE_SYSTEM_NAME} (${CMAKE_SYSTEM_PROCESSOR})") set(system_name_and_processor "${CMAKE_SYSTEM_NAME} (${CMAKE_SYSTEM_PROCESSOR})")
@ -544,8 +544,8 @@ function(_qt_internal_sbom_generate_add_file)
cmake_parse_arguments(PARSE_ARGV 0 arg "${opt_args}" "${single_args}" "${multi_args}") cmake_parse_arguments(PARSE_ARGV 0 arg "${opt_args}" "${single_args}" "${multi_args}")
_qt_internal_validate_all_args_are_parsed(arg) _qt_internal_validate_all_args_are_parsed(arg)
qt_internal_sbom_set_default_option_value_and_error_if_empty(FILENAME "") _qt_internal_sbom_set_default_option_value_and_error_if_empty(FILENAME "")
qt_internal_sbom_set_default_option_value_and_error_if_empty(FILETYPE "") _qt_internal_sbom_set_default_option_value_and_error_if_empty(FILETYPE "")
set(check_option "") set(check_option "")
if(arg_SPDXID) if(arg_SPDXID)
@ -558,8 +558,8 @@ function(_qt_internal_sbom_generate_add_file)
HINTS "SPDXRef-${arg_FILENAME}" HINTS "SPDXRef-${arg_FILENAME}"
) )
qt_internal_sbom_set_default_option_value(LICENSE "NOASSERTION") _qt_internal_sbom_set_default_option_value(LICENSE "NOASSERTION")
qt_internal_sbom_set_default_option_value(COPYRIGHT "NOASSERTION") _qt_internal_sbom_set_default_option_value(COPYRIGHT "NOASSERTION")
get_property(sbom_project_spdx_id GLOBAL PROPERTY _qt_sbom_project_spdx_id) get_property(sbom_project_spdx_id GLOBAL PROPERTY _qt_sbom_project_spdx_id)
if(NOT sbom_project_spdx_id) if(NOT sbom_project_spdx_id)
@ -702,7 +702,7 @@ function(_qt_internal_sbom_generate_add_external_reference)
cmake_parse_arguments(PARSE_ARGV 0 arg "${opt_args}" "${single_args}" "${multi_args}") cmake_parse_arguments(PARSE_ARGV 0 arg "${opt_args}" "${single_args}" "${multi_args}")
_qt_internal_validate_all_args_are_parsed(arg) _qt_internal_validate_all_args_are_parsed(arg)
qt_internal_sbom_set_default_option_value_and_error_if_empty(EXTERNAL_DOCUMENT_FILE_PATH "") _qt_internal_sbom_set_default_option_value_and_error_if_empty(EXTERNAL_DOCUMENT_FILE_PATH "")
if(NOT arg_EXTERNAL_DOCUMENT_SPDX_ID) if(NOT arg_EXTERNAL_DOCUMENT_SPDX_ID)
get_property(spdx_id_count GLOBAL PROPERTY _qt_sbom_spdx_id_count) get_property(spdx_id_count GLOBAL PROPERTY _qt_sbom_spdx_id_count)
@ -841,7 +841,7 @@ function(_qt_internal_sbom_generate_add_package)
cmake_parse_arguments(PARSE_ARGV 0 arg "${opt_args}" "${single_args}" "${multi_args}") cmake_parse_arguments(PARSE_ARGV 0 arg "${opt_args}" "${single_args}" "${multi_args}")
_qt_internal_validate_all_args_are_parsed(arg) _qt_internal_validate_all_args_are_parsed(arg)
qt_internal_sbom_set_default_option_value_and_error_if_empty(PACKAGE "") _qt_internal_sbom_set_default_option_value_and_error_if_empty(PACKAGE "")
set(check_option "") set(check_option "")
if(arg_SPDXID) if(arg_SPDXID)
@ -854,13 +854,13 @@ function(_qt_internal_sbom_generate_add_package)
HINTS "SPDXRef-${arg_PACKAGE}" HINTS "SPDXRef-${arg_PACKAGE}"
) )
qt_internal_sbom_set_default_option_value(DOWNLOAD_LOCATION "NOASSERTION") _qt_internal_sbom_set_default_option_value(DOWNLOAD_LOCATION "NOASSERTION")
qt_internal_sbom_set_default_option_value(VERSION "unknown") _qt_internal_sbom_set_default_option_value(VERSION "unknown")
qt_internal_sbom_set_default_option_value(SUPPLIER "Person: Anonymous") _qt_internal_sbom_set_default_option_value(SUPPLIER "Person: Anonymous")
qt_internal_sbom_set_default_option_value(LICENSE_DECLARED "NOASSERTION") _qt_internal_sbom_set_default_option_value(LICENSE_DECLARED "NOASSERTION")
qt_internal_sbom_set_default_option_value(LICENSE_CONCLUDED "NOASSERTION") _qt_internal_sbom_set_default_option_value(LICENSE_CONCLUDED "NOASSERTION")
qt_internal_sbom_set_default_option_value(COPYRIGHT "NOASSERTION") _qt_internal_sbom_set_default_option_value(COPYRIGHT "NOASSERTION")
qt_internal_sbom_set_default_option_value(PURPOSE "OTHER") _qt_internal_sbom_set_default_option_value(PURPOSE "OTHER")
set(fields "") set(fields "")
@ -984,7 +984,7 @@ function(_qt_internal_sbom_generate_add_project_relationship)
cmake_parse_arguments(PARSE_ARGV 0 arg "${opt_args}" "${single_args}" "${multi_args}") cmake_parse_arguments(PARSE_ARGV 0 arg "${opt_args}" "${single_args}" "${multi_args}")
_qt_internal_validate_all_args_are_parsed(arg) _qt_internal_validate_all_args_are_parsed(arg)
qt_internal_sbom_set_default_option_value_and_error_if_empty(RELATIONSHIPS "") _qt_internal_sbom_set_default_option_value_and_error_if_empty(RELATIONSHIPS "")
_qt_internal_get_staging_area_spdx_file_path(staging_area_spdx_file) _qt_internal_get_staging_area_spdx_file_path(staging_area_spdx_file)
@ -1085,7 +1085,7 @@ function(_qt_internal_sbom_generate_add_license)
cmake_parse_arguments(PARSE_ARGV 0 arg "${opt_args}" "${single_args}" "${multi_args}") cmake_parse_arguments(PARSE_ARGV 0 arg "${opt_args}" "${single_args}" "${multi_args}")
_qt_internal_validate_all_args_are_parsed(arg) _qt_internal_validate_all_args_are_parsed(arg)
qt_internal_sbom_set_default_option_value_and_error_if_empty(LICENSE_ID "") _qt_internal_sbom_set_default_option_value_and_error_if_empty(LICENSE_ID "")
set(check_option "") set(check_option "")
if(arg_SPDXID) if(arg_SPDXID)
@ -1138,7 +1138,7 @@ function(_qt_internal_sbom_get_and_check_spdx_id)
cmake_parse_arguments(PARSE_ARGV 0 arg "${opt_args}" "${single_args}" "${multi_args}") cmake_parse_arguments(PARSE_ARGV 0 arg "${opt_args}" "${single_args}" "${multi_args}")
_qt_internal_validate_all_args_are_parsed(arg) _qt_internal_validate_all_args_are_parsed(arg)
qt_internal_sbom_set_default_option_value_and_error_if_empty(VARIABLE "") _qt_internal_sbom_set_default_option_value_and_error_if_empty(VARIABLE "")
if(NOT arg_CHECK) if(NOT arg_CHECK)
get_property(spdx_id_count GLOBAL PROPERTY _qt_sbom_spdx_id_count) get_property(spdx_id_count GLOBAL PROPERTY _qt_sbom_spdx_id_count)