mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 05:11:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ninja-minor-cleanups'

Browse Source 
c2e949b700 cmGlobalNinjaGenerator: remove unnecessary virtual method
1cfba13004 cmGlobalNinjaGenerator: fix lambda variable name typo
f02c3c6181 cmFileCommand: combine string literals

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8901
This commit is contained in:
Brad King
2023-10-23 13:40:21 +00:00
committed by Kitware Robot
parent e32c6a1c1c c2e949b700
commit 8a79a20257
3 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmFileCommand.cxx
View File

@@ -1322,13 +1322,15 @@ bool HandleRealPathCommand(std::vector<std::string> const& args,
if (oldPolicyPath != realPath) {
status.GetMakefile().IssueMessage(
MessageType::AUTHOR_WARNING,
cmStrCat(
cmPolicies::GetPolicyWarning(cmPolicies::CMP0152), '\n',
"From input path:\n ", input,
"\nthe policy OLD behavior produces path:\n ", oldPolicyPath,
"\nbut the policy NEW behavior produces path:\n ", realPath,
"\nSince the policy is not set, CMake is using the OLD "
"behavior for compatibility."));
cmStrCat(cmPolicies::GetPolicyWarning(cmPolicies::CMP0152),
"\n"
"From input path:\n ",
input, "\nthe policy OLD behavior produces path:\n ",
oldPolicyPath,
"\nbut the policy NEW behavior produces path:\n ",
realPath,
"\nSince the policy is not set, CMake is using the OLD "
"behavior for compatibility."));
}
}
realPath = oldPolicyPath;

19
Source/cmGlobalNinjaGenerator.cxx
View File

@@ -1357,10 +1357,10 @@ void cmGlobalNinjaGenerator::AppendTargetDepends(
} else {
cmNinjaDeps outs;
auto computeISPCOuputs = [](cmGlobalNinjaGenerator* gg,
cmGeneratorTarget const* depTarget,
cmNinjaDeps& outputDeps,
const std::string& targetConfig) {
auto computeISPCOutputs = [](cmGlobalNinjaGenerator* gg,
cmGeneratorTarget const* depTarget,
cmNinjaDeps& outputDeps,
const std::string& targetConfig) {
if (depTarget->CanCompileSources()) {
auto headers = depTarget->GetGeneratedISPCHeaders(targetConfig);
if (!headers.empty()) {
@@ -1384,10 +1384,10 @@ void cmGlobalNinjaGenerator::AppendTargetDepends(
}
if (targetDep.IsCross()) {
this->AppendTargetOutputs(targetDep, outs, fileConfig, depends);
computeISPCOuputs(this, targetDep, outs, fileConfig);
computeISPCOutputs(this, targetDep, outs, fileConfig);
} else {
this->AppendTargetOutputs(targetDep, outs, config, depends);
computeISPCOuputs(this, targetDep, outs, config);
computeISPCOutputs(this, targetDep, outs, config);
}
}
std::sort(outs.begin(), outs.end());
@@ -3183,10 +3183,3 @@ std::string cmGlobalNinjaMultiGenerator::OrderDependsTargetForTarget(
return cmStrCat("cmake_object_order_depends_target_", target->GetName(), '_',
cmSystemTools::UpperCase(config));
}
std::string cmGlobalNinjaMultiGenerator::OrderDependsTargetForTargetPrivate(
cmGeneratorTarget const* target, const std::string& config) const
{
return cmStrCat(this->OrderDependsTargetForTarget(target, config),
"_private");
}

5
Source/cmGlobalNinjaGenerator.h
View File

@@ -349,7 +349,7 @@ public:
virtual std::string OrderDependsTargetForTarget(
cmGeneratorTarget const* target, const std::string& config) const;
virtual std::string OrderDependsTargetForTargetPrivate(
std::string OrderDependsTargetForTargetPrivate(
cmGeneratorTarget const* target, const std::string& config) const;
void AppendTargetOutputs(cmGeneratorTarget const* target,
@@ -741,9 +741,6 @@ public:
std::string OrderDependsTargetForTarget(
cmGeneratorTarget const* target, const std::string& config) const override;
std::string OrderDependsTargetForTargetPrivate(
cmGeneratorTarget const* target, const std::string& config) const override;
protected:
bool OpenBuildFileStreams() override;
void CloseBuildFileStreams() override;