Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-05-08 22:37:04 +08:00
Code Issues Projects Releases Wiki Activity

cmGeneratorExpression: Constify use of cmLocalGenerator

Browse Source
This commit is contained in:
Brad King 2025-04-15 10:38:32 -04:00
parent 88f54fba43
commit 0aabf32590
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmGeneratorExpression.cxx
View File

@ -43,7 +43,7 @@ std::unique_ptr<cmCompiledGeneratorExpression> cmGeneratorExpression::Parse(
}
std::string cmGeneratorExpression::Evaluate(
std::string input, cmLocalGenerator* lg, std::string const& config,
std::string input, cmLocalGenerator const* lg, std::string const& config,
cmGeneratorTarget const* headTarget,
cmGeneratorExpressionDAGChecker* dagChecker,
cmGeneratorTarget const* currentTarget, std::string const& language)
@ -63,7 +63,7 @@ std::string cmGeneratorExpression::Evaluate(
}
std::string const& cmCompiledGeneratorExpression::Evaluate(
cmLocalGenerator* lg, std::string const& config,
cmLocalGenerator const* lg, std::string const& config,
cmGeneratorTarget const* headTarget,
cmGeneratorExpressionDAGChecker* dagChecker,
cmGeneratorTarget const* currentTarget, std::string const& language) const

8
Source/cmGeneratorExpression.h
View File

@ -46,7 +46,7 @@ public:
std::string input) const;
static std::string Evaluate(
std::string input, cmLocalGenerator* lg, std::string const& config,
std::string input, cmLocalGenerator const* lg, std::string const& config,
cmGeneratorTarget const* headTarget = nullptr,
cmGeneratorExpressionDAGChecker* dagChecker = nullptr,
cmGeneratorTarget const* currentTarget = nullptr,
@ -103,7 +103,7 @@ public:
cmCompiledGeneratorExpression const&) = delete;
std::string const& Evaluate(
cmLocalGenerator* lg, std::string const& config,
cmLocalGenerator const* lg, std::string const& config,
cmGeneratorTarget const* headTarget = nullptr,
cmGeneratorExpressionDAGChecker* dagChecker = nullptr,
cmGeneratorTarget const* currentTarget = nullptr,
@ -185,7 +185,7 @@ private:
class cmGeneratorExpressionInterpreter
{
public:
cmGeneratorExpressionInterpreter(cmLocalGenerator* localGenerator,
cmGeneratorExpressionInterpreter(cmLocalGenerator const* localGenerator,
std::string config,
cmGeneratorTarget const* headTarget,
std::string language = std::string())
@ -208,7 +208,7 @@ public:
protected:
cmGeneratorExpression GeneratorExpression;
std::unique_ptr<cmCompiledGeneratorExpression> CompiledGeneratorExpression;
cmLocalGenerator* LocalGenerator = nullptr;
cmLocalGenerator const* LocalGenerator = nullptr;
std::string Config;
cmGeneratorTarget const* HeadTarget = nullptr;
std::string Language;

2
Source/cmGeneratorExpressionContext.cxx
View File

@ -5,7 +5,7 @@
#include <utility>
cmGeneratorExpressionContext::cmGeneratorExpressionContext(
cmLocalGenerator* lg, std::string config, bool quiet,
cmLocalGenerator const* lg, std::string config, bool quiet,
cmGeneratorTarget const* headTarget, cmGeneratorTarget const* currentTarget,
bool evaluateForBuildsystem, cmListFileBacktrace backtrace,
std::string language)

4
Source/cmGeneratorExpressionContext.h
View File

@ -13,7 +13,7 @@ class cmLocalGenerator;
struct cmGeneratorExpressionContext
{
cmGeneratorExpressionContext(cmLocalGenerator* lg, std::string config,
cmGeneratorExpressionContext(cmLocalGenerator const* lg, std::string config,
bool quiet, cmGeneratorTarget const* headTarget,
cmGeneratorTarget const* currentTarget,
bool evaluateForBuildsystem,
@ -27,7 +27,7 @@ struct cmGeneratorExpressionContext
std::set<cmGeneratorTarget const*> SourceSensitiveTargets;
std::map<cmGeneratorTarget const*, std::map<std::string, std::string>>
MaxLanguageStandard;
cmLocalGenerator* LG;
cmLocalGenerator const* LG;
std::string Config;
std::string Language;
// The target whose property is being evaluated.

14
Source/cmGeneratorExpressionNode.cxx
View File

@ -52,7 +52,7 @@
#include "cmake.h"
std::string cmGeneratorExpressionNode::EvaluateDependentExpression(
std::string const& prop, cmLocalGenerator* lg,
std::string const& prop, cmLocalGenerator const* lg,
cmGeneratorExpressionContext* context, cmGeneratorTarget const* headTarget,
cmGeneratorExpressionDAGChecker* dagChecker,
cmGeneratorTarget const* currentTarget)
@ -2337,7 +2337,7 @@ static const struct CompileLanguageNode : public cmGeneratorExpressionNode
return std::string();
}
cmGlobalGenerator* gg = context->LG->GetGlobalGenerator();
cmGlobalGenerator const* gg = context->LG->GetGlobalGenerator();
std::string genName = gg->GetName();
if (genName.find("Makefiles") == std::string::npos &&
genName.find("Ninja") == std::string::npos &&
@ -2387,7 +2387,7 @@ static const struct CompileLanguageAndIdNode : public cmGeneratorExpressionNode
"add_custom_target, or file(GENERATE) commands.");
return std::string();
}
cmGlobalGenerator* gg = context->LG->GetGlobalGenerator();
cmGlobalGenerator const* gg = context->LG->GetGlobalGenerator();
std::string genName = gg->GetName();
if (genName.find("Makefiles") == std::string::npos &&
genName.find("Ninja") == std::string::npos &&
@ -2441,7 +2441,7 @@ static const struct LinkLanguageNode : public cmGeneratorExpressionNode
return std::string();
}
cmGlobalGenerator* gg = context->LG->GetGlobalGenerator();
cmGlobalGenerator const* gg = context->LG->GetGlobalGenerator();
std::string genName = gg->GetName();
if (genName.find("Makefiles") == std::string::npos &&
genName.find("Ninja") == std::string::npos &&
@ -2532,7 +2532,7 @@ static const struct LinkLanguageAndIdNode : public cmGeneratorExpressionNode
return std::string();
}
cmGlobalGenerator* gg = context->LG->GetGlobalGenerator();
cmGlobalGenerator const* gg = context->LG->GetGlobalGenerator();
std::string genName = gg->GetName();
if (genName.find("Makefiles") == std::string::npos &&
genName.find("Ninja") == std::string::npos &&
@ -3149,7 +3149,7 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
reportError(context, content->GetOriginalExpression(), e.str());
return std::string();
}
cmGlobalGenerator* gg = context->LG->GetGlobalGenerator();
cmGlobalGenerator const* gg = context->LG->GetGlobalGenerator();
{
std::string reason;
if (!context->EvaluateForBuildsystem &&
@ -3523,7 +3523,7 @@ struct TargetFilesystemArtifactDependencyCMP0112
cmGeneratorExpressionContext* context)
{
context->AllTargets.insert(target);
cmLocalGenerator* lg = context->LG;
cmLocalGenerator const* lg = context->LG;
switch (target->GetPolicyStatusCMP0112()) {
case cmPolicies::WARN:
if (lg->GetMakefile()->PolicyOptionalWarningEnabled(

2
Source/cmGeneratorExpressionNode.h
View File

@ -46,7 +46,7 @@ struct cmGeneratorExpressionNode
cmGeneratorExpressionDAGChecker* dagChecker) const = 0;
static std::string EvaluateDependentExpression(
std::string const& prop, cmLocalGenerator* lg,
std::string const& prop, cmLocalGenerator const* lg,
cmGeneratorExpressionContext* context, cmGeneratorTarget const* headTarget,
cmGeneratorExpressionDAGChecker* dagChecker,
cmGeneratorTarget const* currentTarget);