diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx index f0dcde7a47..f35ee52e5f 100644 --- a/Source/cmGeneratorExpression.cxx +++ b/Source/cmGeneratorExpression.cxx @@ -43,7 +43,7 @@ std::unique_ptr 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 diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h index 3ffc39d3b5..e5269b1d99 100644 --- a/Source/cmGeneratorExpression.h +++ b/Source/cmGeneratorExpression.h @@ -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 CompiledGeneratorExpression; - cmLocalGenerator* LocalGenerator = nullptr; + cmLocalGenerator const* LocalGenerator = nullptr; std::string Config; cmGeneratorTarget const* HeadTarget = nullptr; std::string Language; diff --git a/Source/cmGeneratorExpressionContext.cxx b/Source/cmGeneratorExpressionContext.cxx index a934717582..21d45b987c 100644 --- a/Source/cmGeneratorExpressionContext.cxx +++ b/Source/cmGeneratorExpressionContext.cxx @@ -5,7 +5,7 @@ #include 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) diff --git a/Source/cmGeneratorExpressionContext.h b/Source/cmGeneratorExpressionContext.h index d0134775c7..20ce592890 100644 --- a/Source/cmGeneratorExpressionContext.h +++ b/Source/cmGeneratorExpressionContext.h @@ -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 SourceSensitiveTargets; std::map> MaxLanguageStandard; - cmLocalGenerator* LG; + cmLocalGenerator const* LG; std::string Config; std::string Language; // The target whose property is being evaluated. diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx index ed61993efe..90bb06be86 100644 --- a/Source/cmGeneratorExpressionNode.cxx +++ b/Source/cmGeneratorExpressionNode.cxx @@ -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( diff --git a/Source/cmGeneratorExpressionNode.h b/Source/cmGeneratorExpressionNode.h index 865f71cbe3..df4ee5fdbd 100644 --- a/Source/cmGeneratorExpressionNode.h +++ b/Source/cmGeneratorExpressionNode.h @@ -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);