mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-25 04:09:36 +03:00
Code Activity

Merge topic 'multi_export_sbom'

Browse Source 
2900aa2911 SBOM: Update experimental UUID
273fc4cc49 SBOM: Support multi export set SBOMs
9669829573 Install: Refactor ResolveTargetsInGeneratorExpression
7c31cbf9ae SBOM: Handle PACKAGE_URL argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12080
This commit is contained in:
Brad King
2026-06-02 09:15:40 -04:00
committed by Kitware Robot
parent af125c28f3 2900aa2911
commit f4c858d328
130 changed files with 1926 additions and 905 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmMakefile.h
+11 -4
View File
@@ -53,6 +53,7 @@ class cmCompiledGeneratorExpression;
class cmCustomCommandLines;
class cmExecutionStatus;
class cmExpandedCommandArgument;
class cmBuildSbomGenerator;
class cmExportBuildFileGenerator;
class cmGeneratorExpressionEvaluationFile;
class cmGlobalGenerator;
@@ -901,9 +902,6 @@ public:
//! Initialize a makefile from its parent
void InitializeFromParent(cmMakefile* parent);
bool ExplicitlyGeneratesSbom() const;
void SetExplicitlyGeneratesSbom(bool status = true);
void AddInstallGenerator(std::unique_ptr<cmInstallGenerator> g);
std::vector<std::unique_ptr<cmInstallGenerator>>& GetInstallGenerators()
@@ -1113,6 +1111,12 @@ public:
void AddExportBuildFileGenerator(
std::unique_ptr<cmExportBuildFileGenerator> gen);
#ifndef CMAKE_BOOTSTRAP
std::vector<std::unique_ptr<cmBuildSbomGenerator>> const&
GetBuildSbomGenerators() const;
void AddBuildSbomGenerator(std::unique_ptr<cmBuildSbomGenerator> gen);
#endif
// Maintain a stack of package roots to allow nested PACKAGE_ROOT_PATH
// searches
std::deque<std::vector<std::string>> FindPackageRootPathStack;
@@ -1299,6 +1303,10 @@ private:
std::vector<std::unique_ptr<cmExportBuildFileGenerator>>
ExportBuildFileGenerators;
#ifndef CMAKE_BOOTSTRAP
std::vector<std::unique_ptr<cmBuildSbomGenerator>> BuildSbomGenerators;
#endif
std::vector<std::unique_ptr<cmGeneratorExpressionEvaluationFile>>
EvaluationFiles;
@@ -1357,7 +1365,6 @@ private:
cmFindPackageStack FindPackageStack;
unsigned int FindPackageStackNextIndex = 0;
bool ExplicitSbomGenerator = false;
bool DebugFindPkg = false;
bool CheckSystemVars;