diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-13 15:54:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-03-21 14:02:34 (GMT) |
| commit | 075f6454092ae058add228eda8220a3680b2f9e4 (patch) | |
| tree | c0bff4ce5eaf25b8e38d904f3cfb64ebfc13265b /Source/cmGeneratorTarget.cxx | |
| parent | 21c4ec4ffe1c40382f6b435ff49eade31e1137f2 (diff) | |
| download | CMake-075f6454092ae058add228eda8220a3680b2f9e4.zip CMake-075f6454092ae058add228eda8220a3680b2f9e4.tar.gz CMake-075f6454092ae058add228eda8220a3680b2f9e4.tar.bz2 | |
Support WINDOWS_EXPORT_ALL_SYMBOLS with `.def` files
The `WINDOWS_EXPORT_ALL_SYMBOLS` target property exports all symbols
found in object files explicitly given to the linker. However, the
linker may also find additional symbols in dependencies and copy them
into the linked binary (e.g. from `msvcrt.lib`). Provide a way to
export an explicit list of such symbols by adding a `.def` file as a
source file.
Fixes: #16473
Diffstat (limited to 'Source/cmGeneratorTarget.cxx')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 29698cf..e27424f 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -1973,15 +1973,16 @@ cmGeneratorTarget::GetModuleDefinitionInfo(std::string const& config) const void cmGeneratorTarget::ComputeModuleDefinitionInfo( std::string const& config, ModuleDefinitionInfo& info) const { - std::vector<cmSourceFile const*> sources; - this->GetModuleDefinitionSources(sources, config); + this->GetModuleDefinitionSources(info.Sources, config); info.WindowsExportAllSymbols = this->Makefile->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS") && this->GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS"); - if (info.WindowsExportAllSymbols) { + info.DefFileGenerated = + info.WindowsExportAllSymbols || info.Sources.size() > 1; + if (info.DefFileGenerated) { info.DefFile = this->ObjectDirectory /* has slash */ + "exports.def"; - } else if (!sources.empty()) { - info.DefFile = sources.front()->GetFullPath(); + } else if (!info.Sources.empty()) { + info.DefFile = info.Sources.front()->GetFullPath(); } } |