summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalNinjaGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-05-15 15:51:57 (GMT)
committerBrad King <brad.king@kitware.com>2017-05-15 15:51:57 (GMT)
commiteeb47fbeb203117111bee8f6690a5f272209d104 (patch)
treedc35ca28c9f5c1f8c7e9de944cc8c681c8de7dd3 /Source/cmLocalNinjaGenerator.cxx
parent471779764757a3a6e4b5fb1db9b8943630b18f3d (diff)
downloadCMake-eeb47fbeb203117111bee8f6690a5f272209d104.zip
CMake-eeb47fbeb203117111bee8f6690a5f272209d104.tar.gz
CMake-eeb47fbeb203117111bee8f6690a5f272209d104.tar.bz2
cmLocalCommonGenerator: Save CMAKE_BUILD_TYPE on construction
Copy the value to our `ConfigName` member on construction to ensure it is available even to code paths that run before `Generate`. We once needed to delay this lookup until `Generate` because the local generators were at one time created before `Configure`. Now they are created at generate time which is late enough to expect `CMAKE_BUILD_TYPE` to be available. Without this, `cmGlobalUnixMakefileGenerator3::WriteConvenienceRules` causes use of `ConfigName` before it is populated which breaks use of source files that depend on the `$<CONFIG>` generator expression. Fixes: #16889
Diffstat (limited to 'Source/cmLocalNinjaGenerator.cxx')
-rw-r--r--Source/cmLocalNinjaGenerator.cxx2
1 files changed, 0 insertions, 2 deletions
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index fd2b803..a8350b3 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -58,8 +58,6 @@ void cmLocalNinjaGenerator::Generate()
this->HomeRelativeOutputPath = "";
}
- this->SetConfigName();
-
this->WriteProcessedMakefile(this->GetBuildFileStream());
#ifdef NINJA_GEN_VERBOSE_FILES
this->WriteProcessedMakefile(this->GetRulesFileStream());