summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--PATCHES5
-rw-r--r--src/net/sf/antcontrib/cpptasks/CompilerEnum.java6
2 files changed, 11 insertions, 0 deletions
diff --git a/PATCHES b/PATCHES
index d4bccb2..2dc0313 100644
--- a/PATCHES
+++ b/PATCHES
@@ -1,5 +1,10 @@
*** ALL Changes marked with FREEHEP or BEGINFREEHEP-ENDFREEHEP.
+* cpptasks-1.0-beta-4-parallel-3-SNAPSHOT
+
+- [src/net/sf/antcontrib/cpptasks/intel/IntelLinuxFortranCompiler.java] added ifort.
+- [src/net/sf/antcontrib/cpptasks/CompilerEnum.java] added ifort.
+
* cpptasks-1.0-beta-4-parallel-2
- [src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java] g++ handles gfortran static linking.
diff --git a/src/net/sf/antcontrib/cpptasks/CompilerEnum.java b/src/net/sf/antcontrib/cpptasks/CompilerEnum.java
index fec8e72..96723b9 100644
--- a/src/net/sf/antcontrib/cpptasks/CompilerEnum.java
+++ b/src/net/sf/antcontrib/cpptasks/CompilerEnum.java
@@ -30,6 +30,7 @@ import net.sf.antcontrib.cpptasks.intel.IntelLinux32CCompiler;
import net.sf.antcontrib.cpptasks.intel.IntelLinux32Compiler;
import net.sf.antcontrib.cpptasks.intel.IntelLinux64CCompiler;
import net.sf.antcontrib.cpptasks.intel.IntelLinux64Compiler;
+import net.sf.antcontrib.cpptasks.intel.IntelLinuxFortranCompiler;
import net.sf.antcontrib.cpptasks.intel.IntelWin32CCompiler;
import net.sf.antcontrib.cpptasks.intel.IntelWin64CCompiler;
import net.sf.antcontrib.cpptasks.mozilla.XpidlCompiler;
@@ -103,6 +104,10 @@ import org.apache.tools.ant.types.EnumeratedAttribute;
* <td>Intel C++ compiler for Linux (IA-32)</td>
* </tr>
* <tr>
+ * <td>ifort</td>
+ * <td>Intel Fortran compiler for Linux (IA-32)</td>
+ * </tr>
+ * <tr>
* <td>ecc</td>
* <td>Intel C++ compiler for Linux (IA-64)</td>
* </tr>
@@ -202,6 +207,7 @@ public class CompilerEnum extends EnumeratedAttribute {
new ProcessorEnumValue("ecc", IntelLinux64CCompiler.getInstance()),
new ProcessorEnumValue("icpc", IntelLinux32Compiler.getInstance()),
new ProcessorEnumValue("ecpc", IntelLinux64Compiler.getInstance()),
+ new ProcessorEnumValue("ifort", IntelLinuxFortranCompiler.getInstance()),
// ENDFREEHEP
new ProcessorEnumValue("CC", ForteCCCompiler.getInstance()),
// BEGINFREEHEP