diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-28 18:25:51 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-02-28 18:25:51 (GMT) |
| commit | 71852e969b711edeacff0b7143eda8c00a412bf1 (patch) | |
| tree | 5bfdb3932c617aa9448e021927a95f82676775bb | |
| parent | 18731d60ac4f14c080ef593c1b1f0a5beb330b02 (diff) | |
| parent | c9a7f3135e06147d663e98d910b65a38595f378b (diff) | |
| download | CMake-71852e969b711edeacff0b7143eda8c00a412bf1.zip CMake-71852e969b711edeacff0b7143eda8c00a412bf1.tar.gz CMake-71852e969b711edeacff0b7143eda8c00a412bf1.tar.bz2 | |
Merge branch 'vs2019' into release-3.14
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)) { |