[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-333-g365fb19

[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  365fb19ffc683351fff43b06d19f3834e8468b35 (commit)
       via  3f15665a4554efde8d80d6fac689dca187f520bc (commit)
      from  b5652bfe6e4443fd380b6883a058f9852ff6b1ad (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=365fb19ffc683351fff43b06d19f3834e8468b35
commit 365fb19ffc683351fff43b06d19f3834e8468b35
Merge: b5652bf 3f15665
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 7 10:08:59 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 7 10:08:59 2016 -0500

    Merge topic 'vs14-debug-enum-older-toolsets' into next
    
    3f15665a VS: Fix VS 2015 .vcxproj debug setting for v100 toolset (#15986)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f15665a4554efde8d80d6fac689dca187f520bc
commit 3f15665a4554efde8d80d6fac689dca187f520bc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 7 10:07:39 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 7 10:07:39 2016 -0500

    VS: Fix VS 2015 .vcxproj debug setting for v100 toolset (#15986)

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 769edac..c9c09fd 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2670,7 +2670,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
       static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
     const char* toolset = gg->GetPlatformToolset();
     if (toolset &&
-        (cmHasLiteralPrefix(toolset, "v110") ||
+        (cmHasLiteralPrefix(toolset, "v100") ||
+         cmHasLiteralPrefix(toolset, "v110") ||
          cmHasLiteralPrefix(toolset, "v120")))
       {
       if (const char* debug = linkOptions.GetFlag("GenerateDebugInformation"))

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake