An update will be applied January 25th, between 12PM and 1:00PM EST (UTC -5:00). The site may be slow during that time.

Commit 61370547 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'vs-minor-cleanups'

042aca55 VS: Verify that MSBuild.exe and devenv.com exist before using them
a756c74d Help: Clarify meaning of MSVC<NN> variables
parents 48b33b06 042aca55
MSVC10
------
``True`` when using Microsoft Visual C++ 10.0
Set to ``true`` when the compiler is version 10.0 of Microsoft Visual C++.
``True`` when using the Microsoft Visual Studio ``v100`` toolset
(``cl`` version 16) or another compiler that simulates it.
MSVC11
------
``True`` when using Microsoft Visual C++ 11.0
Set to ``true`` when the compiler is version 11.0 of Microsoft Visual C++.
``True`` when using the Microsoft Visual Studio ``v110`` toolset
(``cl`` version 17) or another compiler that simulates it.
MSVC12
------
``True`` when using Microsoft Visual C++ 12.0.
Set to ``true`` when the compiler is version 12.0 of Microsoft Visual C++.
``True`` when using the Microsoft Visual Studio ``v120`` toolset
(``cl`` version 18) or another compiler that simulates it.
MSVC14
------
``True`` when using Microsoft Visual C++ 14.0.
Set to ``true`` when the compiler is version 14.0 of Microsoft Visual C++.
``True`` when using the Microsoft Visual Studio ``v140`` toolset
(``cl`` version 19) or another compiler that simulates it.
MSVC80
------
``True`` when using Microsoft Visual C++ 8.0.
Set to ``true`` when the compiler is version 8.0 of Microsoft Visual C++.
``True`` when using the Microsoft Visual Studio ``v80`` toolset
(``cl`` version 14) or another compiler that simulates it.
MSVC90
------
``True`` when using Microsoft Visual C++ 9.0.
Set to ``true`` when the compiler is version 9.0 of Microsoft Visual C++.
``True`` when using the Microsoft Visual Studio ``v90`` toolset
(``cl`` version 15) or another compiler that simulates it.
......@@ -350,16 +350,22 @@ std::string const& cmGlobalVisualStudio10Generator::GetMSBuildCommand()
std::string cmGlobalVisualStudio10Generator::FindMSBuildCommand()
{
std::string msbuild;
std::string mskey =
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions\\";
std::string mskey;
// Search in standard location.
mskey = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions\\";
mskey += this->GetToolsVersion();
mskey += ";MSBuildToolsPath";
if (cmSystemTools::ReadRegistryValue(mskey.c_str(), msbuild,
cmSystemTools::KeyWOW64_32)) {
cmSystemTools::ConvertToUnixSlashes(msbuild);
msbuild += "/";
msbuild += "/MSBuild.exe";
if (cmSystemTools::FileExists(msbuild, true)) {
return msbuild;
}
}
msbuild += "MSBuild.exe";
msbuild = "MSBuild.exe";
return msbuild;
}
......
......@@ -150,13 +150,20 @@ std::string const& cmGlobalVisualStudio7Generator::GetDevEnvCommand()
std::string cmGlobalVisualStudio7Generator::FindDevEnvCommand()
{
std::string vscmd;
std::string vskey = this->GetRegistryBase() + ";InstallDir";
std::string vskey;
// Search in standard location.
vskey = this->GetRegistryBase() + ";InstallDir";
if (cmSystemTools::ReadRegistryValue(vskey.c_str(), vscmd,
cmSystemTools::KeyWOW64_32)) {
cmSystemTools::ConvertToUnixSlashes(vscmd);
vscmd += "/";
vscmd += "/devenv.com";
if (cmSystemTools::FileExists(vscmd, true)) {
return vscmd;
}
}
vscmd += "devenv.com";
vscmd = "devenv.com";
return vscmd;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment