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 /Source/cmLocalGenerator.cxx | |
| 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.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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; |