diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-19 11:41:22 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-09-19 11:42:08 (GMT) |
| commit | d686f81e58200c68c1e89094210e9587e0e90983 (patch) | |
| tree | 21296c61a94fe71a1dc3a33484bbe38e32e2374b | |
| parent | f4ff60a803170311f49511a60a381eef8b78c5dd (diff) | |
| download | CMake-d686f81e58200c68c1e89094210e9587e0e90983.zip CMake-d686f81e58200c68c1e89094210e9587e0e90983.tar.gz CMake-d686f81e58200c68c1e89094210e9587e0e90983.tar.bz2 | |
Restore possibly regressed CMP0018 logic
Refactoring in commit f4ff60a803 (cmMakefile: Make GetSafeDefinition
return std::string const&, 2018-09-05) changed the treatment of the
empty string in CMP0018 diagnostic logic. Restore the behavior.
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 5 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index f504b9f..c45acf7 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); diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 7eb4ef4..7030725 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1826,7 +1826,7 @@ bool cmLocalGenerator::GetShouldUseOldFlags(bool shared, flagsVar += "_FLAGS"; std::string const& flags = this->Makefile->GetSafeDefinition(flagsVar); - if (!flags.empty() && flags != originalFlags) { + if (flags != originalFlags) { switch (this->GetPolicyStatus(cmPolicies::CMP0018)) { case cmPolicies::WARN: { std::ostringstream e; |