mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'vs2019'

Browse Source 
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
This commit is contained in:
Brad King
2019-03-01 14:07:13 +00:00
committed by Kitware Robot
parent 96a99d4069 c9a7f3135e
commit 8b1716a62a
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Help/release/3.14.rst
View File

@@ -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

8
Source/cmVSSetupHelper.cxx
View File

@@ -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)) {