[Cmake-commits] CMake branch, master, updated. v3.13.1-573-gcd4ac72

[Kitware Robot]

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, master has been updated
       via  cd4ac7235cb24c80f4661f42aaebb2e08ec7215e (commit)
       via  eaac307aadb0cf7b2075cd6bea5cf2ea44d49227 (commit)
       via  45c95a3327cbb7f0b1ab61e6d656c1130f34a684 (commit)
       via  071c0e3ce42010ac62a22dfb62c7b6510506771b (commit)
      from  0780a8f57ac6a593a53fe2fe9ce22c889a77d5fb (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=cd4ac7235cb24c80f4661f42aaebb2e08ec7215e
commit cd4ac7235cb24c80f4661f42aaebb2e08ec7215e
Merge: eaac307 071c0e3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 6 13:51:15 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Dec 6 08:51:23 2018 -0500

    Merge topic 'support_ewdk_install'
    
    071c0e3ce4 cmVSSetupHelper: Support Enterprise WDK build enviornment
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2658


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eaac307aadb0cf7b2075cd6bea5cf2ea44d49227
commit eaac307aadb0cf7b2075cd6bea5cf2ea44d49227
Merge: 0780a8f 45c95a3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 6 08:48:00 2018 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 6 08:48:00 2018 -0500

    Merge branch 'release-3.13'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=071c0e3ce42010ac62a22dfb62c7b6510506771b
commit 071c0e3ce42010ac62a22dfb62c7b6510506771b
Author:     Jon Doron <arilou at gmail.com>
AuthorDate: Mon Nov 26 09:23:59 2018 +0200
Commit:     Jon Doron <arilou at gmail.com>
CommitDate: Tue Nov 27 07:13:26 2018 +0200

    cmVSSetupHelper: Support Enterprise WDK build enviornment
    
    Enterprise WDK is a command line build enviornment that does not require
    any installation prior to use.
    
    More information and download can be found here:
    https://docs.microsoft.com/en-us/windows-hardware/drivers/develop/using-the-enterprise-wdk
    
    Signed-off-by: Jon Doron <arilou at gmail.com>

diff --git a/Source/cmVSSetupHelper.cxx b/Source/cmVSSetupHelper.cxx
index 22fe007..7a54e12 100644
--- a/Source/cmVSSetupHelper.cxx
+++ b/Source/cmVSSetupHelper.cxx
@@ -267,6 +267,19 @@ bool cmVSSetupAPIHelper::GetVCToolsetVersion(std::string& vsToolsetVersion)
   return isInstalled && !vsToolsetVersion.empty();
 }
 
+bool cmVSSetupAPIHelper::IsEWDKEnabled()
+{
+  std::string envEnterpriseWDK, envDisableRegistryUse;
+  cmSystemTools::GetEnv("EnterpriseWDK", envEnterpriseWDK);
+  cmSystemTools::GetEnv("DisableRegistryUse", envDisableRegistryUse);
+  if (!cmSystemTools::Strucmp(envEnterpriseWDK.c_str(), "True") &&
+      !cmSystemTools::Strucmp(envDisableRegistryUse.c_str(), "True")) {
+    return true;
+  }
+
+  return false;
+}
+
 bool cmVSSetupAPIHelper::EnumerateAndChooseVSInstance()
 {
   bool isVSInstanceExists = false;
@@ -274,6 +287,26 @@ bool cmVSSetupAPIHelper::EnumerateAndChooseVSInstance()
     return true;
   }
 
+  if (this->IsEWDKEnabled()) {
+    std::string envWindowsSdkDir81, envVSVersion, envVsInstallDir;
+
+    cmSystemTools::GetEnv("WindowsSdkDir_81", envWindowsSdkDir81);
+    cmSystemTools::GetEnv("VisualStudioVersion", envVSVersion);
+    cmSystemTools::GetEnv("VSINSTALLDIR", envVsInstallDir);
+    if (envVSVersion.empty() || envVsInstallDir.empty())
+      return false;
+
+    chosenInstanceInfo.VSInstallLocation =
+      std::wstring(envVsInstallDir.begin(), envVsInstallDir.end());
+    chosenInstanceInfo.Version =
+      std::wstring(envVSVersion.begin(), envVSVersion.end());
+    chosenInstanceInfo.VCToolsetVersion = envVSVersion;
+    chosenInstanceInfo.ullVersion = std::stoi(envVSVersion);
+    chosenInstanceInfo.IsWin10SDKInstalled = true;
+    chosenInstanceInfo.IsWin81SDKInstalled = !envWindowsSdkDir81.empty();
+    return true;
+  }
+
   if (initializationFailure || setupConfig == NULL || setupConfig2 == NULL ||
       setupHelper == NULL)
     return false;
diff --git a/Source/cmVSSetupHelper.h b/Source/cmVSSetupHelper.h
index 4144c15..b9cca45 100644
--- a/Source/cmVSSetupHelper.h
+++ b/Source/cmVSSetupHelper.h
@@ -150,6 +150,7 @@ private:
   HRESULT comInitialized;
   // current best instance of VS selected
   VSInstanceInfo chosenInstanceInfo;
+  bool IsEWDKEnabled();
 
   std::string SpecifiedVSInstallLocation;
 };

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

Summary of changes:
 Source/cmVSSetupHelper.cxx | 33 +++++++++++++++++++++++++++++++++
 Source/cmVSSetupHelper.h   |  1 +
 2 files changed, 34 insertions(+)


hooks/post-receive
-- 
CMake