[Cmake-commits] CMake branch, next, updated. v3.3.2-3471-g32fc001

[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  32fc0010896ca65ad6904377c53831e9fb062a25 (commit)
       via  458121116a05665ebc0cf6a066977c00b8e55e5c (commit)
      from  2977e8e345bf27c147a3da97dbbb6b12d83ee3e9 (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=32fc0010896ca65ad6904377c53831e9fb062a25
commit 32fc0010896ca65ad6904377c53831e9fb062a25
Merge: 2977e8e 4581211
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 2 16:19:17 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 2 16:19:17 2015 -0400

    Merge topic 'vs-win10-sdk' into next
    
    45812111 VS: Select latest Windows 10 SDK if no specific version was requested


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=458121116a05665ebc0cf6a066977c00b8e55e5c
commit 458121116a05665ebc0cf6a066977c00b8e55e5c
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Fri Oct 2 11:34:55 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 2 16:18:44 2015 -0400

    VS: Select latest Windows 10 SDK if no specific version was requested
    
    If CMAKE_SYSTEM_VERSION is just "10.0" then use the latest SDK available
    since no particular version was requested.

diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx
index 74679d8..661dddd 100644
--- a/Source/cmGlobalVisualStudio14Generator.cxx
+++ b/Source/cmGlobalVisualStudio14Generator.cxx
@@ -202,14 +202,23 @@ std::string cmGlobalVisualStudio14Generator::GetWindows10SDKVersion()
     // has a version less or equal to our version of the operating system
     std::sort(sdks.begin(), sdks.end(), cmSystemTools::VersionCompareGreater);
 
-    for (std::vector<std::string>::iterator i = sdks.begin();
-         i != sdks.end(); ++i)
+    // Select a suitable SDK version.
+    if (this->SystemVersion == "10.0")
+      {
+      // Use the latest Windows 10 SDK since no build version was given.
+      return sdks.at(0);
+      }
+    else
       {
       // Find the SDK less or equal to our specified version
-      if (!cmSystemTools::VersionCompareGreater(*i, this->SystemVersion))
+      for (std::vector<std::string>::iterator i = sdks.begin();
+           i != sdks.end(); ++i)
         {
-        // This is the most recent SDK that we can run safely
-        return *i;
+        if (!cmSystemTools::VersionCompareGreater(*i, this->SystemVersion))
+          {
+          // This is the most recent SDK that we can run safely
+          return *i;
+          }
         }
       }
     }

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

Summary of changes:
 Source/cmGlobalVisualStudio14Generator.cxx |   19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake