diff options
| author | Alexander Boczar <alexboc@microsoft.com> | 2019-09-14 00:32:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-10-15 17:28:41 (GMT) |
| commit | 99e83d423500e11a8e85c2032e8c536bce175ed1 (patch) | |
| tree | ad294f09e5fb3f9804e3f99d64f95d9bbc51761a /Source/cmGlobalGenerator.cxx | |
| parent | 60509518124e715994900afa88530558b248510c (diff) | |
| download | CMake-99e83d423500e11a8e85c2032e8c536bce175ed1.zip CMake-99e83d423500e11a8e85c2032e8c536bce175ed1.tar.gz CMake-99e83d423500e11a8e85c2032e8c536bce175ed1.tar.bz2 | |
cmake: Teach --build mode to load CMAKE_GENERATOR_TOOLSET
Extend the `cmGlobalGenerator::SetGeneratorToolset` signature to
indicate when it is called from `cmake::build`.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 96656a5..2efafc6 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -165,7 +165,7 @@ bool cmGlobalGenerator::SetGeneratorPlatform(std::string const& p, return false; } -bool cmGlobalGenerator::SetGeneratorToolset(std::string const& ts, +bool cmGlobalGenerator::SetGeneratorToolset(std::string const& ts, bool, cmMakefile* mf) { if (ts.empty()) { @@ -650,7 +650,7 @@ void cmGlobalGenerator::EnableLanguage( // Tell the generator about the toolset, if any. std::string toolset = mf->GetSafeDefinition("CMAKE_GENERATOR_TOOLSET"); - if (!this->SetGeneratorToolset(toolset, mf)) { + if (!this->SetGeneratorToolset(toolset, false, mf)) { cmSystemTools::SetFatalErrorOccured(); return; } |