diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-15 15:51:57 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-05-15 15:51:57 (GMT) |
| commit | eeb47fbeb203117111bee8f6690a5f272209d104 (patch) | |
| tree | dc35ca28c9f5c1f8c7e9de944cc8c681c8de7dd3 /Source/cmLocalUnixMakefileGenerator3.cxx | |
| parent | 471779764757a3a6e4b5fb1db9b8943630b18f3d (diff) | |
| download | CMake-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/cmLocalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 5f52786..959178e 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -105,8 +105,6 @@ cmLocalUnixMakefileGenerator3::~cmLocalUnixMakefileGenerator3() void cmLocalUnixMakefileGenerator3::Generate() { - this->SetConfigName(); - // Record whether some options are enabled to avoid checking many // times later. if (!this->GetGlobalGenerator()->GetCMakeInstance()->GetIsInTryCompile()) { |