kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'VS-Fortran-Intel-2013'

Browse Source 
8945489 VS: Set Intel Fortran 13 project version
This commit is contained in:
David Cole 2012-06-12 15:59:41 -04:00 committed by CMake Topic Stage
commit f848dbfe3c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -1933,9 +1933,11 @@ cmLocalVisualStudio7Generator
vskey += "\\Packages\\" CM_INTEL_PLUGIN_GUID ";ProductVersion"; vskey += "\\Packages\\" CM_INTEL_PLUGIN_GUID ";ProductVersion";
cmSystemTools::ReadRegistryValue(vskey.c_str(), intelVersion, cmSystemTools::ReadRegistryValue(vskey.c_str(), intelVersion,
cmSystemTools::KeyWOW64_32); cmSystemTools::KeyWOW64_32);
if (intelVersion.find("12") == 0 || (intelVersion.find("11") == 0)) if (intelVersion.find("13") == 0 ||
intelVersion.find("12") == 0 ||
intelVersion.find("11") == 0)
{ {
// Version 11.x and 12.x actually use 11.0 in project files! // Version 11.x, 12.x, and 13.x actually use 11.0 in project files!
intelVersion = "11.0" ; intelVersion = "11.0" ;
} }
else if(intelVersion.find("10") == 0) else if(intelVersion.find("10") == 0)