diff options
| author | Brad King <brad.king@kitware.com> | 2012-09-18 15:39:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-09-18 18:03:02 (GMT) |
| commit | 7ee3cee9199e1207813e245b2bca18526d6bd74c (patch) | |
| tree | deed59324f089833453fa9458caaa8daa4bab7c8 /Source | |
| parent | e17f3458ce8c5eaba53dc00d273d3456746c7fd4 (diff) | |
| download | CMake-7ee3cee9199e1207813e245b2bca18526d6bd74c.zip CMake-7ee3cee9199e1207813e245b2bca18526d6bd74c.tar.gz CMake-7ee3cee9199e1207813e245b2bca18526d6bd74c.tar.bz2 | |
VS11: Add VS 2012 Express support (#13348)
Use the registry entries that vsvars32.bat uses to detect the location of
MSBuild.exe in the framework directory. Invoke MSBuild with the option
/p:VisualStudioVersion=$version
so it knows from which VS version to load the system build rules. Teach
cmGlobalVisualStudio11Generator to set its ExpressEdition member using the
registry.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudio11Generator.cxx | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index d188980..480c577 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -205,6 +205,8 @@ std::string cmGlobalVisualStudio10Generator { makeCommand += "Debug"; } + makeCommand += " /p:VisualStudioVersion="; + makeCommand += this->GetIDEVersion(); if ( additionalOptions ) { makeCommand += " "; diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx index 7bb4d0c..23a1204 100644 --- a/Source/cmGlobalVisualStudio11Generator.cxx +++ b/Source/cmGlobalVisualStudio11Generator.cxx @@ -17,7 +17,10 @@ cmGlobalVisualStudio11Generator::cmGlobalVisualStudio11Generator() { this->FindMakeProgramFile = "CMakeVS11FindMake.cmake"; - this->ExpressEdition = false; // TODO: VS 11 Express support + std::string vc11Express; + this->ExpressEdition = cmSystemTools::ReadRegistryValue( + "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\11.0\\Setup\\VC;" + "ProductDir", vc11Express, cmSystemTools::KeyWOW64_32); this->PlatformToolset = "v110"; } |