[Cmake-commits] CMake branch, next, updated. v3.6.0-812-g1f35c2a

[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  1f35c2a1c083c4dacf00178e3f375f06e641a096 (commit)
       via  36fc3a53728e1a6774cdd6dee57fac063ff32b9c (commit)
      from  fb6b92b265bb3456a9f76372d623d9f603bcd9f1 (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=1f35c2a1c083c4dacf00178e3f375f06e641a096
commit 1f35c2a1c083c4dacf00178e3f375f06e641a096
Merge: fb6b92b 36fc3a5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 13 09:36:07 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 13 09:36:07 2016 -0400

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36fc3a53728e1a6774cdd6dee57fac063ff32b9c
commit 36fc3a53728e1a6774cdd6dee57fac063ff32b9c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 13 09:35:39 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 13 09:35:39 2016 -0400

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

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 3b1cddb..fb05976 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2354,7 +2354,8 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions(
     cmGlobalVisualStudio10Generator* gg =
       static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
     const char* toolset = gg->GetPlatformToolset();
-    if (toolset && (cmHasLiteralPrefix(toolset, "v100") ||
+    if (toolset && (cmHasLiteralPrefix(toolset, "v90") ||
+                    cmHasLiteralPrefix(toolset, "v100") ||
                     cmHasLiteralPrefix(toolset, "v110") ||
                     cmHasLiteralPrefix(toolset, "v120"))) {
       if (const char* debug =

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

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


hooks/post-receive
-- 
CMake