diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-19 14:32:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-09-19 14:33:01 (GMT) |
| commit | 76a19eb6c16272e4600267aed6ed7aff0fd9c765 (patch) | |
| tree | f4052ab80d82c26830286fa724f064186ec4836c /Source/cmGlobalGenerator.cxx | |
| parent | 3ada513413e2a911efac2de2c90bbebd820fef5d (diff) | |
| parent | 2428422c02de1feac008d2ba1a6ad075aaf7ba2c (diff) | |
| download | CMake-76a19eb6c16272e4600267aed6ed7aff0fd9c765.zip CMake-76a19eb6c16272e4600267aed6ed7aff0fd9c765.tar.gz CMake-76a19eb6c16272e4600267aed6ed7aff0fd9c765.tar.bz2 | |
Merge topic 'fix-getsafedef-stdstring'
2428422c02 Fix regression in target output file naming logic
d686f81e58 Restore possibly regressed CMP0018 logic
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2402
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 1dd20b6..23df7f1 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -828,11 +828,8 @@ void cmGlobalGenerator::EnableLanguage( std::string sharedLibFlagsVar = "CMAKE_SHARED_LIBRARY_"; sharedLibFlagsVar += lang; sharedLibFlagsVar += "_FLAGS"; - std::string const& sharedLibFlags = + this->LanguageToOriginalSharedLibFlags[lang] = mf->GetSafeDefinition(sharedLibFlagsVar); - if (!sharedLibFlags.empty()) { - this->LanguageToOriginalSharedLibFlags[lang] = sharedLibFlags; - } // Translate compiler ids for compatibility. this->CheckCompilerIdCompatibility(mf, lang); |