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

Ninja Multi-Config: Fix cross-config custom command dependency tracing

Browse Source 
Process `CMAKE_CROSS_CONFIGS` and friends to properly configure the
generator for cross-config behavior before custom command dependency
tracing.
This commit is contained in:
Brad King
2021-11-04 11:58:06 -04:00
parent fda948846b
commit 16e24748c5
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmGlobalGenerator.cxx
View File

@@ -1402,6 +1402,9 @@ bool cmGlobalGenerator::Compute()
this->SupportsDefaultConfigs())) {
return false;
}
if (!this->InspectConfigTypeVariables()) {
return false;
}
// Some generators track files replaced during the Generate.
// Start with an empty vector:

2
Source/cmGlobalGenerator.h
View File

@@ -153,6 +153,8 @@ public:
*/
virtual void Configure();
virtual bool InspectConfigTypeVariables() { return true; }
bool Compute();
virtual void AddExtraIDETargets() {}

3
Source/cmGlobalNinjaGenerator.cxx
View File

@@ -568,9 +568,6 @@ void cmGlobalNinjaGenerator::Generate()
msg.str());
return;
}
if (!this->InspectConfigTypeVariables()) {
return;
}
if (!this->OpenBuildFileStreams()) {
return;
}

2
Source/cmGlobalNinjaGenerator.h
View File

@@ -481,8 +481,6 @@ protected:
const std::set<std::string>& all, const std::set<std::string>& defaults,
const std::vector<std::string>& items);
virtual bool InspectConfigTypeVariables() { return true; }
std::set<std::string> CrossConfigs;
std::set<std::string> DefaultConfigs;
std::string DefaultFileConfig;