diff options
author | Brad King <brad.king@kitware.com> | 2016-10-10 14:23:39 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-10-10 14:23:39 (GMT) |
commit | 8fe948c54cd0a7a06b5c56e8a40dab945c5a08e7 (patch) | |
tree | 1f3beba6b596f01a3a9d50d3704c6962f73eb051 /Source/cmGhsMultiTargetGenerator.cxx | |
parent | 9c7fc00a45b6f0891c95fba707b0e2ce9d2e2dbf (diff) | |
parent | c637e0c53b5b81d6605018bd64ea2769f356662a (diff) | |
download | CMake-8fe948c54cd0a7a06b5c56e8a40dab945c5a08e7.zip CMake-8fe948c54cd0a7a06b5c56e8a40dab945c5a08e7.tar.gz CMake-8fe948c54cd0a7a06b5c56e8a40dab945c5a08e7.tar.bz2 |
Merge topic 'minor-cleanups'
c637e0c5 cmMakefile: Return a string from GetDefineFlags
fbc1b75c Test: Remove condition for CMake version no longer supported
3d0e95f6 cmLocalGenerator: Extract definition retrieval out of loop
2a49d86d Makefiles: Inline only use of method
b0301db2 Makefiles: Make helper class independent of cmLocalGenerator
267e0209 cmMakefile: Remove pointless condition
009019f2 Makefiles: Extract identical code from condition
378849f4 Makefiles: Replace array access with local variable
4a3c49b4 Makefiles: Separate two coupled calls
Diffstat (limited to 'Source/cmGhsMultiTargetGenerator.cxx')
-rw-r--r-- | Source/cmGhsMultiTargetGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx index 959dfdb..fac68f5 100644 --- a/Source/cmGhsMultiTargetGenerator.cxx +++ b/Source/cmGhsMultiTargetGenerator.cxx @@ -244,7 +244,7 @@ void cmGhsMultiTargetGenerator::SetCompilerFlags(std::string const& config, flags, this->GeneratorTarget, lang); // Append old-style preprocessor definition flags. - if (std::string(" ") != std::string(this->Makefile->GetDefineFlags())) { + if (this->Makefile->GetDefineFlags() != " ") { this->LocalGenerator->AppendFlags(flags, this->Makefile->GetDefineFlags()); } |