summaryrefslogtreecommitdiff
path: root/Source/cmLocalGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-10-10 09:02:41 -0400
committerBrad King <brad.king@kitware.com>2018-10-10 09:34:12 -0400
commit8f076acdb0af6e319005338e3e25d127043e3275 (patch)
tree6c8a60642c5142d937b6b67ae465bdc4bed1ea47 /Source/cmLocalGenerator.cxx
parentf39bc297dbd5fbce2f547408e583f0e9a8205aef (diff)
downloadcmake-8f076acdb0af6e319005338e3e25d127043e3275.tar.gz
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.cxx14
1 files changed, 3 insertions, 11 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 70307252e2..40e183ca88 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(