diff options
| author | David Cole <david.cole@kitware.com> | 2011-10-03 11:54:15 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-10-03 11:54:15 -0400 |
| commit | 68e43c2fadbb6e396c0a609f6e3848689297d5fb (patch) | |
| tree | 6040b29c37254595169abc668ec0a44f73c58b20 | |
| parent | a92b17e42187f0a16a3489f989de0a9c97c7e1e3 (diff) | |
| parent | 8f1ee5181d9a4c8c17f516a01a1772a741e3cb14 (diff) | |
| download | cmake-68e43c2fadbb6e396c0a609f6e3848689297d5fb.tar.gz | |
Merge topic 'fix_intel_vs_version'
8f1ee51 Also, check for 11.x as an intel fortran version.
0cd3606 Use version 11.0 for 12.x and 9.10 for 10.x intel versions to fix 12.1 vsIDE.
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 54175845ef..d9b2772989 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -1836,14 +1836,14 @@ cmLocalVisualStudio7Generator vskey += "\\Packages\\" CM_INTEL_PLUGIN_GUID ";ProductVersion"; cmSystemTools::ReadRegistryValue(vskey.c_str(), intelVersion, cmSystemTools::KeyWOW64_32); - if (intelVersion == "12.0") + if (intelVersion.find("12") == 0 || (intelVersion.find("11") == 0)) { - // Version 12 actually uses 11.0 in project files! + // Version 11.x and 12.x actually use 11.0 in project files! intelVersion = "11.0" ; } - else if(intelVersion == "10.1") + else if(intelVersion.find("10") == 0) { - // Version 10.1 actually uses 9.10 in project files! + // Version 10.x actually uses 9.10 in project files! intelVersion = "9.10"; } |