[Cmake-commits] CMake branch, next, updated. v3.7.2-2407-g6d2ebf5

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6d2ebf57d7ad7e9772ef2cbc2321329b03e50770 (commit)
       via  4dde0bc8ef1d953b8e4b13a2e465d756b5274933 (commit)
      from  6932f8466cae72e4d231bb2ce4929d38a306e00a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d2ebf57d7ad7e9772ef2cbc2321329b03e50770
commit 6d2ebf57d7ad7e9772ef2cbc2321329b03e50770
Merge: 6932f84 4dde0bc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 30 09:01:40 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 30 09:01:40 2017 -0500

    Merge topic 'vs-export-external-objects' into next
    
    4dde0bc8 VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for external objects


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4dde0bc8ef1d953b8e4b13a2e465d756b5274933
commit 4dde0bc8ef1d953b8e4b13a2e465d756b5274933
Author:     Zsolt Parragi <zsolt.parragi at cancellar.hu>
AuthorDate: Sat Jan 28 17:10:02 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 30 08:54:49 2017 -0500

    VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for external objects
    
    Teach Visual Studio generators to include external object files in the
    list of objects whose symbols are to be exported.  The Makefile and
    Ninja generators already did this.

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) {

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudioGenerator.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)


hooks/post-receive
-- 
CMake