diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-01 14:07:13 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-03-01 14:07:29 (GMT) |
| commit | 8b1716a62a4209d274cfb2334aa2330f21d6dbcb (patch) | |
| tree | 282ff20f5cf4206d1a32401615f000465f5dc230 | |
| parent | 96a99d40698110dd81bf6222a6b9ad83daacc0e8 (diff) | |
| parent | c9a7f3135e06147d663e98d910b65a38595f378b (diff) | |
| download | CMake-8b1716a62a4209d274cfb2334aa2330f21d6dbcb.zip CMake-8b1716a62a4209d274cfb2334aa2330f21d6dbcb.tar.gz CMake-8b1716a62a4209d274cfb2334aa2330f21d6dbcb.tar.bz2 | |
Merge topic 'vs2019'
c9a7f3135e Help: Update VS 2019 generator release note for preview 4
00c1120837 VS: Drop workaround needed only for VS 2019 preview 2 and 3
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Egor Pugin <egor.pugin@gmail.com>
Merge-request: !3044
| -rw-r--r-- | Help/release/3.14.rst | 2 | ||||
| -rw-r--r-- | Source/cmVSSetupHelper.cxx | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/Help/release/3.14.rst b/Help/release/3.14.rst index e4b4d38..5038a75 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 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)) { |