add detection of Intel Composer XE 2013 Fortran 45/9945/1
Antoine ELIAS [Thu, 6 Dec 2012 16:44:35 +0000 (17:44 +0100)]
Change-Id: I04a494231706587f081e9df0fa9f28a17252944b

scilab/modules/dynamic_link/macros/configure_msifort.sci
scilab/modules/dynamic_link/macros/detectmsifort64tools.sci
scilab/modules/dynamic_link/macros/findmsifortcompiler.sci
scilab/modules/dynamic_link/src/scripts/Makefile.incl.mak

index 7c86d22..7033e9c 100644 (file)
@@ -23,6 +23,8 @@ function ifpath = getIFpath(ifversion)
        ifpath = getenv("IFORT_COMPILER11", "");
     case "ifort12" then
        ifpath = getenv("IFORT_COMPILER12", "");
+    case "ifort13" then
+       ifpath = getenv("IFORT_COMPILER13", "");
     else
       ifpath = "";
     end
@@ -172,6 +174,8 @@ endfunction
         machinepath = "ia32";
       else
         select ifortcompiler,
+          case "ifort13" then
+             machinepath = "intel64";
           case "ifort12" then
              machinepath = "intel64";
           case "ifort11" then
@@ -182,6 +186,8 @@ endfunction
       end
 
       select ifortcompiler,
+        case "ifort13" then
+          bOK = set_commons_ifort12(if_path, machinepath);
         case "ifort12" then
           bOK = set_commons_ifort12(if_path, machinepath);
         case "ifort11" then
index 31f3505..f8ad01b 100644 (file)
@@ -16,6 +16,9 @@ function bOK = detectmsifort64tools()
    ifortcomp = findmsifortcompiler();
    if ifortcomp <> "unknown" then
      select ifortcomp,
+       case  "ifort13" then
+         IFORTPATH = getenv("IFORT_COMPILER13","");
+
        case  "ifort12" then
          IFORTPATH = getenv("IFORT_COMPILER12","");
 
@@ -42,6 +45,8 @@ function bOK = detectmsifort64tools()
    end
 
    select ifortcomp,
+     case  "ifort13" then
+       IFORTSPATHEMT64 = IFORTPATH + "compiler\lib\intel64";
      case  "ifort12" then
        IFORTSPATHEMT64 = IFORTPATH + "compiler\lib\intel64";
      case  "ifort11" then
index c78486d..b3a1b92 100644 (file)
@@ -13,6 +13,11 @@ function ifortCompiler = findmsifortcompiler()
   ifortCompiler = 'unknown'; // unknown
 
   if getos() == 'Windows' then
+    if getenv('IFORT_COMPILER13','NOK') <> 'NOK' then
+      ifortCompiler = 'ifort13';
+      return
+    end
+
     if getenv('IFORT_COMPILER12','NOK') <> 'NOK' then
       ifortCompiler = 'ifort12';
       return
index e2c2048..5c9c273 100644 (file)
@@ -40,7 +40,7 @@ CC_LDFLAGS =
 # default usage is to use f2c 
 #==================================================
 USE_F2C=YES
-# detect intel fortran compiler 9,10,11.x, 2011 XE family
+# detect intel fortran compiler
 !IF "$(IFORT_COMPILER9)" == ""
 !ELSE
 USE_F2C=NO
@@ -57,6 +57,10 @@ USE_F2C=NO
 !ELSE
 USE_F2C=NO
 !ENDIF
+!IF "$(IFORT_COMPILER13)" == ""
+!ELSE
+USE_F2C=NO
+!ENDIF
 
 #==================================================
 # if USE_F2C is set to NO we will use the following Fortran compiler (i.e Intel Fortran 10.x)