diff options
| author | Brad King <brad.king@kitware.com> | 2011-05-24 18:34:28 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-05-24 18:34:28 (GMT) |
| commit | 7ffb678e4bc4eae1bf747d2ba9d3561c6d09b03a (patch) | |
| tree | de283120a47400cfe9707ad25369c41990c1aa1a | |
| parent | 0c64fcd3097c9aa0c0329cf8c33074aec1cc505e (diff) | |
| parent | 3a8add058b09bc88fabb0ebe5bf59da95d7ebff2 (diff) | |
| download | CMake-7ffb678e4bc4eae1bf747d2ba9d3561c6d09b03a.zip CMake-7ffb678e4bc4eae1bf747d2ba9d3561c6d09b03a.tar.gz CMake-7ffb678e4bc4eae1bf747d2ba9d3561c6d09b03a.tar.bz2 | |
Merge topic 'intel-12-vs-2005'
3a8add0 ENH: Fix Intel 12 plugin project generation for VS < 10
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index b9ffe62..7a62b9c 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -1770,10 +1770,14 @@ cmLocalVisualStudio7Generator vskey += "\\Packages\\" CM_INTEL_PLUGIN_GUID ";ProductVersion"; cmSystemTools::ReadRegistryValue(vskey.c_str(), intelVersion, cmSystemTools::KeyWOW64_32); - - // Version 10.1 actually uses 9.10 in project files! - if(intelVersion == "10.1") + if (intelVersion == "12.0") + { + // Version 12 actually uses 11.0 in project files! + intelVersion = "11.0" ; + } + else if(intelVersion == "10.1") { + // Version 10.1 actually uses 9.10 in project files! intelVersion = "9.10"; } |