summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalNinjaGenerator.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-09-30 13:19:21 (GMT)
committerBrad King <brad.king@kitware.com>2019-09-30 13:19:21 (GMT)
commit05d7ca14e99ee8ad36da01ddb314d0b90ab41874 (patch)
treec923027983a11aef0edb53946ab94aa5fc5f1e2d /Source/cmGlobalNinjaGenerator.h
parent156b56480a786db4d967bde5eb6d5edee56a27d0 (diff)
parentb3b1c7bf3afc8f33fa69b79f47f778cb781ac3c7 (diff)
downloadCMake-05d7ca14e99ee8ad36da01ddb314d0b90ab41874.zip
CMake-05d7ca14e99ee8ad36da01ddb314d0b90ab41874.tar.gz
CMake-05d7ca14e99ee8ad36da01ddb314d0b90ab41874.tar.bz2
Merge branch 'backport-3.14-fix-EXCLUDE_FROM_ALL-subdir-all'
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.h')
-rw-r--r--Source/cmGlobalNinjaGenerator.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 15dd404..04d8e37 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -302,9 +302,9 @@ public:
return LocalGenerators;
}
- bool IsExcluded(cmGeneratorTarget* target)
+ bool IsExcluded(cmLocalGenerator* root, cmGeneratorTarget* target)
{
- return cmGlobalGenerator::IsExcluded(target);
+ return cmGlobalGenerator::IsExcluded(root, target);
}
int GetRuleCmdLength(const std::string& name) { return RuleCmdLength[name]; }