diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-28 16:02:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-02-28 16:04:29 (GMT) |
| commit | 00c11208373cee958966d294e02114dc3900ac34 (patch) | |
| tree | 915e03e93982c25aec743b36208e7371a65d040e /Source/cmVSSetupHelper.cxx | |
| parent | e6897c72e7c59f7a0b82ed19c1bdb40d42f7adaa (diff) | |
| download | CMake-00c11208373cee958966d294e02114dc3900ac34.zip CMake-00c11208373cee958966d294e02114dc3900ac34.tar.gz CMake-00c11208373cee958966d294e02114dc3900ac34.tar.bz2 | |
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
Diffstat (limited to 'Source/cmVSSetupHelper.cxx')
| -rw-r--r-- | Source/cmVSSetupHelper.cxx | 8 |
1 files changed, 0 insertions, 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)) { |