summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio9Generator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-04-27 13:15:20 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-04-27 13:15:20 (GMT)
commit8a00c16b59591fd9b7ab1b2628f0394d6a93c7b1 (patch)
treef6145cd92f36843ed83b7f36d98213059e1d97e3 /Source/cmGlobalVisualStudio9Generator.cxx
parenta594b79b3cd7541ecfbcaaf7247049b172c15f41 (diff)
parent571bedec2970df42b9f3666e17728a7511d32b47 (diff)
downloadCMake-8a00c16b59591fd9b7ab1b2628f0394d6a93c7b1.zip
CMake-8a00c16b59591fd9b7ab1b2628f0394d6a93c7b1.tar.gz
CMake-8a00c16b59591fd9b7ab1b2628f0394d6a93c7b1.tar.bz2
Merge topic 'vs-old-express-no-folders'
571bedec VS: Ignore USE_FOLDER property on VS versions that do not support it 0c58d2d0 VS: Detect VS 8 and 9 Express editions
Diffstat (limited to 'Source/cmGlobalVisualStudio9Generator.cxx')
-rw-r--r--Source/cmGlobalVisualStudio9Generator.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio9Generator.cxx b/Source/cmGlobalVisualStudio9Generator.cxx
index 884f754..da6ffae 100644
--- a/Source/cmGlobalVisualStudio9Generator.cxx
+++ b/Source/cmGlobalVisualStudio9Generator.cxx
@@ -104,6 +104,10 @@ cmGlobalVisualStudio9Generator::cmGlobalVisualStudio9Generator(cmake* cm,
: cmGlobalVisualStudio8Generator(cm, name, platformName)
{
this->Version = VS9;
+ std::string vc9Express;
+ this->ExpressEdition = cmSystemTools::ReadRegistryValue(
+ "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\9.0\\Setup\\VC;"
+ "ProductDir", vc9Express, cmSystemTools::KeyWOW64_32);
}
//----------------------------------------------------------------------------