diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-11 11:43:57 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-10-11 11:44:03 (GMT) |
| commit | e2dd6ac9776e4f5a1995dfc606480b627fdbce72 (patch) | |
| tree | 1ef23ee70d57faa0da1cd3fec9e69ccebbc3d4d5 /Source/cmLocalGenerator.cxx | |
| parent | 9b20d6568a3cd8bfb71d28d67f2ec59f7f41f929 (diff) | |
| parent | 8f076acdb0af6e319005338e3e25d127043e3275 (diff) | |
| download | CMake-e2dd6ac9776e4f5a1995dfc606480b627fdbce72.zip CMake-e2dd6ac9776e4f5a1995dfc606480b627fdbce72.tar.gz CMake-e2dd6ac9776e4f5a1995dfc606480b627fdbce72.tar.bz2 | |
Merge topic 'remove-AddCompileDefinitions'
8f076acdb0 cmLocalGenerator: Remove AddCompileDefinitions method
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2470
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 21b029e..229f884 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -804,16 +804,6 @@ std::string cmLocalGenerator::GetIncludeFlags( return flags; } -void cmLocalGenerator::AddCompileDefinitions(std::set<std::string>& defines, - cmGeneratorTarget const* target, - const std::string& config, - const std::string& lang) const -{ - std::vector<std::string> targetDefines; - target->GetCompileDefinitions(targetDefines, config, lang); - this->AppendDefines(defines, targetDefines); -} - void cmLocalGenerator::AddCompileOptions(std::string& flags, cmGeneratorTarget* target, const std::string& lang, @@ -1268,7 +1258,9 @@ void cmLocalGenerator::GetTargetDefines(cmGeneratorTarget const* target, } // Add preprocessor definitions for this target and configuration. - this->AddCompileDefinitions(defines, target, config, lang); + std::vector<std::string> targetDefines; + target->GetCompileDefinitions(targetDefines, config, lang); + this->AppendDefines(defines, targetDefines); } std::string cmLocalGenerator::GetTargetFortranFlags( |