diff options
| author | Brad King <brad.king@kitware.com> | 2017-01-31 14:04:19 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-01-31 14:04:19 (GMT) |
| commit | 5accbaccbcc5f876a444c26987b66bf6d023880d (patch) | |
| tree | 0585112306b64ac21aff20a462567a07af891237 /Source | |
| parent | f012a95836e14e12f5a445abd72fa79599736641 (diff) | |
| parent | 4dde0bc8ef1d953b8e4b13a2e465d756b5274933 (diff) | |
| download | CMake-5accbaccbcc5f876a444c26987b66bf6d023880d.zip CMake-5accbaccbcc5f876a444c26987b66bf6d023880d.tar.gz CMake-5accbaccbcc5f876a444c26987b66bf6d023880d.tar.bz2 | |
Merge topic 'vs-export-external-objects'
4dde0bc8 VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for external objects
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalVisualStudioGenerator.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index 5edb81f..cc2536c 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -856,6 +856,14 @@ void cmGlobalVisualStudioGenerator::AddSymbolExportCommand( std::string objFile = obj_dir + map_it->second; objs.push_back(objFile); } + std::vector<cmSourceFile const*> externalObjectSources; + gt->GetExternalObjects(externalObjectSources, configName); + for (std::vector<cmSourceFile const*>::const_iterator it = + externalObjectSources.begin(); + it != externalObjectSources.end(); ++it) { + objs.push_back((*it)->GetFullPath()); + } + gt->UseObjectLibraries(objs, configName); for (std::vector<std::string>::iterator it = objs.begin(); it != objs.end(); ++it) { |