Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-22 07:25:02 +08:00
Code Issues Projects Releases Wiki Activity

source: Pass cmBuildOptions by value

Browse Source
This commit is contained in:
Daniel Pfeifer
2025-07-15 20:37:08 +02:00
committed by Brad King
parent fa0e5906ff
commit ee1c32b6d7
23 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmBuildOptions.h
View File

@@ -35,8 +35,6 @@ public:
, ResolveMode(resolveMode) , ResolveMode(resolveMode)
{ {
} }
explicit cmBuildOptions(cmBuildOptions const&) noexcept = default;
cmBuildOptions& operator=(cmBuildOptions const&) noexcept = default;
bool Clean = false; bool Clean = false;
bool Fast = false; bool Fast = false;

3
Source/cmGlobalBorlandMakefileGenerator.cxx
View File

@@ -72,8 +72,7 @@ cmGlobalBorlandMakefileGenerator::GenerateBuildCommand(
std::string const& makeProgram, std::string const& projectName, std::string const& makeProgram, std::string const& projectName,
std::string const& projectDir, std::vector<std::string> const& targetNames, std::string const& projectDir, std::vector<std::string> const& targetNames,
std::string const& config, int /*jobs*/, bool verbose, std::string const& config, int /*jobs*/, bool verbose,
cmBuildOptions const& buildOptions, cmBuildOptions buildOptions, std::vector<std::string> const& makeOptions)
std::vector<std::string> const& makeOptions)
{ {
return this->cmGlobalUnixMakefileGenerator3::GenerateBuildCommand( return this->cmGlobalUnixMakefileGenerator3::GenerateBuildCommand(
makeProgram, projectName, projectDir, targetNames, config, makeProgram, projectName, projectDir, targetNames, config,

2
Source/cmGlobalBorlandMakefileGenerator.h
View File

@@ -63,7 +63,7 @@ protected:
std::string const& makeProgram, std::string const& projectName, std::string const& makeProgram, std::string const& projectName,
std::string const& projectDir, std::vector<std::string> const& targetNames, std::string const& projectDir, std::vector<std::string> const& targetNames,
std::string const& config, int jobs, bool verbose, std::string const& config, int jobs, bool verbose,
cmBuildOptions const& buildOptions = cmBuildOptions(), cmBuildOptions buildOptions = cmBuildOptions(),
std::vector<std::string> const& makeOptions = std::vector<std::string> const& makeOptions =
std::vector<std::string>()) override; std::vector<std::string>()) override;

4
Source/cmGlobalGenerator.cxx
View File

@@ -2167,7 +2167,7 @@ cmGlobalGenerator::GenerateBuildCommand(
std::string const& /*unused*/, std::string const& /*unused*/, std::string const& /*unused*/, std::string const& /*unused*/,
std::string const& /*unused*/, std::vector<std::string> const& /*unused*/, std::string const& /*unused*/, std::vector<std::string> const& /*unused*/,
std::string const& /*unused*/, int /*unused*/, bool /*unused*/, std::string const& /*unused*/, int /*unused*/, bool /*unused*/,
cmBuildOptions const& /*unused*/, std::vector<std::string> const& /*unused*/) cmBuildOptions /*unused*/, std::vector<std::string> const& /*unused*/)
{ {
GeneratedMakeCommand makeCommand; GeneratedMakeCommand makeCommand;
makeCommand.Add("cmGlobalGenerator::GenerateBuildCommand not implemented"); makeCommand.Add("cmGlobalGenerator::GenerateBuildCommand not implemented");
@@ -2185,7 +2185,7 @@ int cmGlobalGenerator::Build(
int jobs, std::string const& /*unused*/, std::string const& bindir, int jobs, std::string const& /*unused*/, std::string const& bindir,
std::string const& projectName, std::vector<std::string> const& targets, std::string const& projectName, std::vector<std::string> const& targets,
std::ostream& ostr, std::string const& makeCommandCSTR, std::ostream& ostr, std::string const& makeCommandCSTR,
std::string const& config, cmBuildOptions const& buildOptions, bool verbose, std::string const& config, cmBuildOptions buildOptions, bool verbose,
cmDuration timeout, cmSystemTools::OutputOption outputMode, cmDuration timeout, cmSystemTools::OutputOption outputMode,
std::vector<std::string> const& nativeOptions) std::vector<std::string> const& nativeOptions)
{ {

6
Source/cmGlobalGenerator.h
View File

@@ -254,8 +254,8 @@ public:
std::string const& projectName, std::string const& projectName,
std::vector<std::string> const& targetNames, std::ostream& ostr, std::vector<std::string> const& targetNames, std::ostream& ostr,
std::string const& makeProgram, std::string const& config, std::string const& makeProgram, std::string const& config,
cmBuildOptions const& buildOptions, bool verbose, cmBuildOptions buildOptions, bool verbose, cmDuration timeout,
cmDuration timeout, cmSystemTools::OutputOption outputMode, cmSystemTools::OutputOption outputMode,
std::vector<std::string> const& nativeOptions = std::vector<std::string> const& nativeOptions =
std::vector<std::string>()); std::vector<std::string>());
@@ -273,7 +273,7 @@ public:
std::string const& makeProgram, std::string const& projectName, std::string const& makeProgram, std::string const& projectName,
std::string const& projectDir, std::vector<std::string> const& targetNames, std::string const& projectDir, std::vector<std::string> const& targetNames,
std::string const& config, int jobs, bool verbose, std::string const& config, int jobs, bool verbose,
cmBuildOptions const& buildOptions = cmBuildOptions(), cmBuildOptions buildOptions = cmBuildOptions(),
std::vector<std::string> const& makeOptions = std::vector<std::string>()); std::vector<std::string> const& makeOptions = std::vector<std::string>());
virtual void PrintBuildCommandAdvice(std::ostream& os, int jobs) const; virtual void PrintBuildCommandAdvice(std::ostream& os, int jobs) const;

3
Source/cmGlobalGhsMultiGenerator.cxx
View File

@@ -470,8 +470,7 @@ cmGlobalGhsMultiGenerator::GenerateBuildCommand(
std::string const& makeProgram, std::string const& projectName, std::string const& makeProgram, std::string const& projectName,
std::string const& projectDir, std::vector<std::string> const& targetNames, std::string const& projectDir, std::vector<std::string> const& targetNames,
std::string const& /*config*/, int jobs, bool verbose, std::string const& /*config*/, int jobs, bool verbose,
cmBuildOptions const& /*buildOptions*/, cmBuildOptions /*buildOptions*/, std::vector<std::string> const& makeOptions)
std::vector<std::string> const& makeOptions)
{ {
GeneratedMakeCommand makeCommand; GeneratedMakeCommand makeCommand;

2
Source/cmGlobalGhsMultiGenerator.h
View File

@@ -86,7 +86,7 @@ protected:
std::string const& makeProgram, std::string const& projectName, std::string const& makeProgram, std::string const& projectName,
std::string const& projectDir, std::vector<std::string> const& targetNames, std::string const& projectDir, std::vector<std::string> const& targetNames,
std::string const& config, int jobs, bool verbose, std::string const& config, int jobs, bool verbose,
cmBuildOptions const& buildOptions = cmBuildOptions(), cmBuildOptions buildOptions = cmBuildOptions(),
std::vector<std::string> const& makeOptions = std::vector<std::string> const& makeOptions =
std::vector<std::string>()) override; std::vector<std::string>()) override;
void AddExtraIDETargets() override; void AddExtraIDETargets() override;

3
Source/cmGlobalJOMMakefileGenerator.cxx
View File

@@ -63,8 +63,7 @@ cmGlobalJOMMakefileGenerator::GenerateBuildCommand(
std::string const& makeProgram, std::string const& projectName, std::string const& makeProgram, std::string const& projectName,
std::string const& projectDir, std::vector<std::string> const& targetNames, std::string const& projectDir, std::vector<std::string> const& targetNames,
std::string const& config, int jobs, bool verbose, std::string const& config, int jobs, bool verbose,
cmBuildOptions const& buildOptions, cmBuildOptions buildOptions, std::vector<std::string> const& makeOptions)
std::vector<std::string> const& makeOptions)
{ {
std::vector<std::string> jomMakeOptions; std::vector<std::string> jomMakeOptions;

2
Source/cmGlobalJOMMakefileGenerator.h
View File

@@ -54,7 +54,7 @@ protected:
std::string const& makeProgram, std::string const& projectName, std::string const& makeProgram, std::string const& projectName,
std::string const& projectDir, std::vector<std::string> const& targetNames, std::string const& projectDir, std::vector<std::string> const& targetNames,
std::string const& config, int jobs, bool verbose, std::string const& config, int jobs, bool verbose,
cmBuildOptions const& buildOptions = cmBuildOptions(), cmBuildOptions buildOptions = cmBuildOptions(),
std::vector<std::string> const& makeOptions = std::vector<std::string> const& makeOptions =
std::vector<std::string>()) override; std::vector<std::string>()) override;

3
Source/cmGlobalNMakeMakefileGenerator.cxx
View File

@@ -106,8 +106,7 @@ cmGlobalNMakeMakefileGenerator::GenerateBuildCommand(
std::string const& makeProgram, std::string const& projectName, std::string const& makeProgram, std::string const& projectName,
std::string const& projectDir, std::vector<std::string> const& targetNames, std::string const& projectDir, std::vector<std::string> const& targetNames,
std::string const& config, int /*jobs*/, bool verbose, std::string const& config, int /*jobs*/, bool verbose,
cmBuildOptions const& buildOptions, cmBuildOptions buildOptions, std::vector<std::string> const& makeOptions)
std::vector<std::string> const& makeOptions)
{ {
std::vector<std::string> nmakeMakeOptions; std::vector<std::string> nmakeMakeOptions;

2
Source/cmGlobalNMakeMakefileGenerator.h
View File

@@ -61,7 +61,7 @@ protected:
std::string const& makeProgram, std::string const& projectName, std::string const& makeProgram, std::string const& projectName,
std::string const& projectDir, std::vector<std::string> const& targetNames, std::string const& projectDir, std::vector<std::string> const& targetNames,
std::string const& config, int jobs, bool verbose, std::string const& config, int jobs, bool verbose,
cmBuildOptions const& buildOptions = cmBuildOptions(), cmBuildOptions buildOptions = cmBuildOptions(),
std::vector<std::string> const& makeOptions = std::vector<std::string> const& makeOptions =
std::vector<std::string>()) override; std::vector<std::string>()) override;

2
Source/cmGlobalNinjaGenerator.cxx
View File

@@ -1001,7 +1001,7 @@ cmGlobalNinjaGenerator::GenerateBuildCommand(
std::string const& makeProgram, std::string const& /*projectName*/, std::string const& makeProgram, std::string const& /*projectName*/,
std::string const& /*projectDir*/, std::string const& /*projectDir*/,
std::vector<std::string> const& targetNames, std::string const& config, std::vector<std::string> const& targetNames, std::string const& config,
int jobs, bool verbose, cmBuildOptions const& /*buildOptions*/, int jobs, bool verbose, cmBuildOptions /*buildOptions*/,
std::vector<std::string> const& makeOptions) std::vector<std::string> const& makeOptions)
{ {
GeneratedMakeCommand makeCommand; GeneratedMakeCommand makeCommand;

2
Source/cmGlobalNinjaGenerator.h
View File

@@ -201,7 +201,7 @@ public:
std::string const& makeProgram, std::string const& projectName, std::string const& makeProgram, std::string const& projectName,
std::string const& projectDir, std::vector<std::string> const& targetNames, std::string const& projectDir, std::vector<std::string> const& targetNames,
std::string const& config, int jobs, bool verbose, std::string const& config, int jobs, bool verbose,
cmBuildOptions const& buildOptions = cmBuildOptions(), cmBuildOptions buildOptions = cmBuildOptions(),
std::vector<std::string> const& makeOptions = std::vector<std::string> const& makeOptions =
std::vector<std::string>()) override; std::vector<std::string>()) override;

2
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@@ -536,7 +536,7 @@ cmGlobalUnixMakefileGenerator3::GenerateBuildCommand(
std::string const& makeProgram, std::string const& /*projectName*/, std::string const& makeProgram, std::string const& /*projectName*/,
std::string const& /*projectDir*/, std::string const& /*projectDir*/,
std::vector<std::string> const& targetNames, std::string const& /*config*/, std::vector<std::string> const& targetNames, std::string const& /*config*/,
int jobs, bool verbose, cmBuildOptions const& buildOptions, int jobs, bool verbose, cmBuildOptions buildOptions,
std::vector<std::string> const& makeOptions) std::vector<std::string> const& makeOptions)
{ {
GeneratedMakeCommand makeCommand; GeneratedMakeCommand makeCommand;

2
Source/cmGlobalUnixMakefileGenerator3.h
View File

@@ -172,7 +172,7 @@ public:
std::string const& makeProgram, std::string const& projectName, std::string const& makeProgram, std::string const& projectName,
std::string const& projectDir, std::vector<std::string> const& targetNames, std::string const& projectDir, std::vector<std::string> const& targetNames,
std::string const& config, int jobs, bool verbose, std::string const& config, int jobs, bool verbose,
cmBuildOptions const& buildOptions = cmBuildOptions(), cmBuildOptions buildOptions = cmBuildOptions(),
std::vector<std::string> const& makeOptions = std::vector<std::string> const& makeOptions =
std::vector<std::string>()) override; std::vector<std::string>()) override;

3
Source/cmGlobalVisualStudio10Generator.cxx
View File

@@ -1050,8 +1050,7 @@ cmGlobalVisualStudio10Generator::GenerateBuildCommand(
std::string const& makeProgram, std::string const& projectName, std::string const& makeProgram, std::string const& projectName,
std::string const& projectDir, std::vector<std::string> const& targetNames, std::string const& projectDir, std::vector<std::string> const& targetNames,
std::string const& config, int jobs, bool verbose, std::string const& config, int jobs, bool verbose,
cmBuildOptions const& buildOptions, cmBuildOptions buildOptions, std::vector<std::string> const& makeOptions)
std::vector<std::string> const& makeOptions)
{ {
std::vector<GeneratedMakeCommand> makeCommands; std::vector<GeneratedMakeCommand> makeCommands;
// Select the caller- or user-preferred make program, else MSBuild. // Select the caller- or user-preferred make program, else MSBuild.

2
Source/cmGlobalVisualStudio10Generator.h
View File

@@ -38,7 +38,7 @@ public:
std::string const& makeProgram, std::string const& projectName, std::string const& makeProgram, std::string const& projectName,
std::string const& projectDir, std::vector<std::string> const& targetNames, std::string const& projectDir, std::vector<std::string> const& targetNames,
std::string const& config, int jobs, bool verbose, std::string const& config, int jobs, bool verbose,
cmBuildOptions const& buildOptions = cmBuildOptions(), cmBuildOptions buildOptions = cmBuildOptions(),
std::vector<std::string> const& makeOptions = std::vector<std::string> const& makeOptions =
std::vector<std::string>()) override; std::vector<std::string>()) override;

2
Source/cmGlobalVisualStudio7Generator.cxx
View File

@@ -217,7 +217,7 @@ cmGlobalVisualStudio7Generator::GenerateBuildCommand(
std::string const& makeProgram, std::string const& projectName, std::string const& makeProgram, std::string const& projectName,
std::string const& /*projectDir*/, std::string const& /*projectDir*/,
std::vector<std::string> const& targetNames, std::string const& config, std::vector<std::string> const& targetNames, std::string const& config,
int /*jobs*/, bool /*verbose*/, cmBuildOptions const& /*buildOptions*/, int /*jobs*/, bool /*verbose*/, cmBuildOptions /*buildOptions*/,
std::vector<std::string> const& makeOptions) std::vector<std::string> const& makeOptions)
{ {
// Select the caller- or user-preferred make program, else devenv. // Select the caller- or user-preferred make program, else devenv.

2
Source/cmGlobalVisualStudio7Generator.h
View File

@@ -78,7 +78,7 @@ public:
std::string const& makeProgram, std::string const& projectName, std::string const& makeProgram, std::string const& projectName,
std::string const& projectDir, std::vector<std::string> const& targetNames, std::string const& projectDir, std::vector<std::string> const& targetNames,
std::string const& config, int jobs, bool verbose, std::string const& config, int jobs, bool verbose,
cmBuildOptions const& buildOptions = cmBuildOptions(), cmBuildOptions buildOptions = cmBuildOptions(),
std::vector<std::string> const& makeOptions = std::vector<std::string> const& makeOptions =
std::vector<std::string>()) override; std::vector<std::string>()) override;

3
Source/cmGlobalWatcomWMakeGenerator.cxx
View File

@@ -67,8 +67,7 @@ cmGlobalWatcomWMakeGenerator::GenerateBuildCommand(
std::string const& makeProgram, std::string const& projectName, std::string const& makeProgram, std::string const& projectName,
std::string const& projectDir, std::vector<std::string> const& targetNames, std::string const& projectDir, std::vector<std::string> const& targetNames,
std::string const& config, int /*jobs*/, bool verbose, std::string const& config, int /*jobs*/, bool verbose,
cmBuildOptions const& buildOptions, cmBuildOptions buildOptions, std::vector<std::string> const& makeOptions)
std::vector<std::string> const& makeOptions)
{ {
return this->cmGlobalUnixMakefileGenerator3::GenerateBuildCommand( return this->cmGlobalUnixMakefileGenerator3::GenerateBuildCommand(
makeProgram, projectName, projectDir, targetNames, config, makeProgram, projectName, projectDir, targetNames, config,

2
Source/cmGlobalWatcomWMakeGenerator.h
View File

@@ -62,7 +62,7 @@ protected:
std::string const& makeProgram, std::string const& projectName, std::string const& makeProgram, std::string const& projectName,
std::string const& projectDir, std::vector<std::string> const& targetNames, std::string const& projectDir, std::vector<std::string> const& targetNames,
std::string const& config, int jobs, bool verbose, std::string const& config, int jobs, bool verbose,
cmBuildOptions const& buildOptions = cmBuildOptions(), cmBuildOptions buildOptions = cmBuildOptions(),
std::vector<std::string> const& makeOptions = std::vector<std::string> const& makeOptions =
std::vector<std::string>()) override; std::vector<std::string>()) override;

2
Source/cmGlobalXCodeGenerator.cxx
View File

@@ -545,7 +545,7 @@ cmGlobalXCodeGenerator::GenerateBuildCommand(
std::string const& makeProgram, std::string const& projectName, std::string const& makeProgram, std::string const& projectName,
std::string const& /*projectDir*/, std::string const& /*projectDir*/,
std::vector<std::string> const& targetNames, std::string const& config, std::vector<std::string> const& targetNames, std::string const& config,
int jobs, bool /*verbose*/, cmBuildOptions const& /*buildOptions*/, int jobs, bool /*verbose*/, cmBuildOptions /*buildOptions*/,
std::vector<std::string> const& makeOptions) std::vector<std::string> const& makeOptions)
{ {
std::string const xcodebuild = std::string const xcodebuild =

2
Source/cmGlobalXCodeGenerator.h
View File

@@ -81,7 +81,7 @@ public:
std::string const& makeProgram, std::string const& projectName, std::string const& makeProgram, std::string const& projectName,
std::string const& projectDir, std::vector<std::string> const& targetNames, std::string const& projectDir, std::vector<std::string> const& targetNames,
std::string const& config, int jobs, bool verbose, std::string const& config, int jobs, bool verbose,
cmBuildOptions const& buildOptions = cmBuildOptions(), cmBuildOptions buildOptions = cmBuildOptions(),
std::vector<std::string> const& makeOptions = std::vector<std::string> const& makeOptions =
std::vector<std::string>()) override; std::vector<std::string>()) override;