diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-10 13:02:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-10-10 13:34:12 (GMT) |
| commit | 8f076acdb0af6e319005338e3e25d127043e3275 (patch) | |
| tree | 6c8a60642c5142d937b6b67ae465bdc4bed1ea47 /Source/cmLocalGenerator.cxx | |
| parent | f39bc297dbd5fbce2f547408e583f0e9a8205aef (diff) | |
| download | CMake-8f076acdb0af6e319005338e3e25d127043e3275.zip CMake-8f076acdb0af6e319005338e3e25d127043e3275.tar.gz CMake-8f076acdb0af6e319005338e3e25d127043e3275.tar.bz2 | |
cmLocalGenerator: Remove AddCompileDefinitions method
This method offers the same definitions as `GetTargetDefines` except
that it excludes the "export" macro on shared libraries. Update call
sites to use `GetTargetDefines` instead. Some of them were incorrectly
excluding the export macro.
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 7030725..40e183c 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -773,16 +773,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, @@ -1237,7 +1227,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( |