From 00c11208373cee958966d294e02114dc3900ac34 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 28 Feb 2019 11:02:53 -0500 Subject: VS: Drop workaround needed only for VS 2019 preview 2 and 3 A temporary workaround added by commit 626c51f47b (VS: Update for Visual Studio 2019 Preview 2, 2019-01-24, v3.14.0-rc1~74^2) is no longer needed as of VS 2019 preview 4. Fixes: #18898 --- Source/cmVSSetupHelper.cxx | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Source/cmVSSetupHelper.cxx b/Source/cmVSSetupHelper.cxx index 91a0e15..c78361e 100644 --- a/Source/cmVSSetupHelper.cxx +++ b/Source/cmVSSetupHelper.cxx @@ -190,14 +190,6 @@ bool cmVSSetupAPIHelper::GetVSInstanceInfo( std::string const vcRoot = vsInstanceInfo.GetInstallLocation(); std::string vcToolsVersionFile = vcRoot + "/VC/Auxiliary/Build/Microsoft.VCToolsVersion.default.txt"; - if (!cmSystemTools::PathExists(vcToolsVersionFile)) { - // FIXME: VS 2019 Preview 2 installs the v142 toolset and does not - // provide the plain `Microsoft.VCToolsVersion.default.txt` that v141 - // does. This should be fixed in preview 3 and this workaround can - // be dropped. Otherwise, we may need to switch to globbing. - vcToolsVersionFile = vcRoot + - "/VC/Auxiliary/Build/Microsoft.VCToolsVersion.v142.default.txt"; - } std::string vcToolsVersion; cmsys::ifstream fin(vcToolsVersionFile.c_str()); if (!fin || !cmSystemTools::GetLineFromStream(fin, vcToolsVersion)) { -- cgit v0.12 From c9a7f3135e06147d663e98d910b65a38595f378b Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 28 Feb 2019 11:05:31 -0500 Subject: Help: Update VS 2019 generator release note for preview 4 --- Help/release/3.14.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Help/release/3.14.rst b/Help/release/3.14.rst index 13d209f..39e6555 100644 --- a/Help/release/3.14.rst +++ b/Help/release/3.14.rst @@ -14,7 +14,7 @@ Generators ---------- * The :generator:`Visual Studio 16 2019` generator was added. This is - experimental and based on "Visual Studio 2019 Preview 2" because this + experimental and based on "Visual Studio 2019 Preview 4" because this version of VS has not been released. The VS 2019 generator differs from generators for earlier versions -- cgit v0.12