summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio7Generator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-09-02 20:15:11 (GMT)
committerBrad King <brad.king@kitware.com>2016-09-07 19:49:08 (GMT)
commitbdc679a8aee4e6b9a8aea795bdbda2341d1e5d08 (patch)
treef9ade938675a59071bd1efe075cc3ff5ec58f7cf /Source/cmGlobalVisualStudio7Generator.cxx
parenta8936656faa14b27173f90046fef6259dceaa321 (diff)
downloadCMake-bdc679a8aee4e6b9a8aea795bdbda2341d1e5d08.zip
CMake-bdc679a8aee4e6b9a8aea795bdbda2341d1e5d08.tar.gz
CMake-bdc679a8aee4e6b9a8aea795bdbda2341d1e5d08.tar.bz2
VS15: Add Visual Studio 15 generator
Call the generator "Visual Studio 15" without any year because the preview version of VS 15 does not provide a year in the product name. Copy cmGlobalVisualStudio14Generator to cmGlobalVisualStudio15Generator and update version numbers accordingly. Add the VS15 enumeration value. Note that we do not need to add a MSVC15 variable or v150 toolset because Visual Studio 15 comes with an updated version of the v140 toolset and remains ABI-compatible. Teach tests VSExternalInclude, RunCMake.GeneratorPlatform, and RunCMake.GeneratorToolset to treat VS 15 as they do VS 10-14. Closes: #16143
Diffstat (limited to 'Source/cmGlobalVisualStudio7Generator.cxx')
-rw-r--r--Source/cmGlobalVisualStudio7Generator.cxx12
1 files changed, 12 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 8d3964f..0dc4497 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -163,6 +163,18 @@ std::string cmGlobalVisualStudio7Generator::FindDevEnvCommand()
}
}
+ // Search where VS15Preview places it.
+ vskey = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VS7;";
+ vskey += this->GetIDEVersion();
+ if (cmSystemTools::ReadRegistryValue(vskey.c_str(), vscmd,
+ cmSystemTools::KeyWOW64_32)) {
+ cmSystemTools::ConvertToUnixSlashes(vscmd);
+ vscmd += "/Common7/IDE/devenv.com";
+ if (cmSystemTools::FileExists(vscmd, true)) {
+ return vscmd;
+ }
+ }
+
vscmd = "devenv.com";
return vscmd;
}