From 8f1ee5181d9a4c8c17f516a01a1772a741e3cb14 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Fri, 30 Sep 2011 17:11:34 -0400 Subject: Also, check for 11.x as an intel fortran version. As Dave Cole pointed out the previous commit only checked for 10.x and 12.x. 11.0 was accounted for, but 11.1, 11.2 and 11.3 were not. This patch should make it work for those versions as well. I did a web check and there are 11.0, 11.1, 11.2 and 11.3 versions from Intel. I assume if 12.x uses 11.0 as the version in the .vfproj file, then all of the 11.x versions would as well. --- Source/cmLocalVisualStudio7Generator.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index be5b4c6..d9b2772 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -1836,9 +1836,9 @@ cmLocalVisualStudio7Generator vskey += "\\Packages\\" CM_INTEL_PLUGIN_GUID ";ProductVersion"; cmSystemTools::ReadRegistryValue(vskey.c_str(), intelVersion, cmSystemTools::KeyWOW64_32); - if (intelVersion.find("12") == 0) + if (intelVersion.find("12") == 0 || (intelVersion.find("11") == 0)) { - // Version 12.x 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.find("10") == 0) -- cgit v0.12