summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorMark Donszelmann <Mark.Donszelmann@gmail.com>2006-06-08 07:07:33 +0000
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2006-06-08 07:07:33 +0000
commitc563ed37f1bfbe0119cf59b2a7010002757d8af9 (patch)
tree43f14a90ad6fdff02448c845dcb1bc33b8633c3e /src/net
parent6a4cb7cdd4f387bdcb19422bfc090f268c2ef83e (diff)
downloadcpptasks-parallel-c563ed37f1bfbe0119cf59b2a7010002757d8af9.tar.gz
cpptasks-parallel-c563ed37f1bfbe0119cf59b2a7010002757d8af9.tar.bz2
cpptasks-parallel-c563ed37f1bfbe0119cf59b2a7010002757d8af9.tar.xz
cpptasks-parallel-c563ed37f1bfbe0119cf59b2a7010002757d8af9.zip
Added gfortran as compiler
Diffstat (limited to 'src/net')
-rw-r--r--src/net/sf/antcontrib/cpptasks/CompilerEnum.java8
-rw-r--r--src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java12
2 files changed, 19 insertions, 1 deletions
diff --git a/src/net/sf/antcontrib/cpptasks/CompilerEnum.java b/src/net/sf/antcontrib/cpptasks/CompilerEnum.java
index 105892e..9bfb35b 100644
--- a/src/net/sf/antcontrib/cpptasks/CompilerEnum.java
+++ b/src/net/sf/antcontrib/cpptasks/CompilerEnum.java
@@ -66,7 +66,11 @@ import org.apache.tools.ant.types.EnumeratedAttribute;
* </tr>
* <tr>
* <td>g77</td>
- * <td>GNU FORTRAN compiler</td>
+ * <td>GNU FORTRAN 77 compiler</td>
+ * </tr>
+ * <tr>
+ * <td>gfortran</td>
+ * <td>GNU FORTRAN 95 compiler</td>
* </tr>
* <tr>
* <td>msvc</td>
@@ -186,7 +190,9 @@ public class CompilerEnum extends EnumeratedAttribute {
new ProcessorEnumValue("gcc", GccCCompiler.getInstance()),
new ProcessorEnumValue("g++", GccCCompiler.getGppInstance()),
new ProcessorEnumValue("c++", GccCCompiler.getCppInstance()),
+// FREEHEP
new ProcessorEnumValue("g77", GccCCompiler.getG77Instance()),
+ new ProcessorEnumValue("gfortran", GccCCompiler.getGFortranInstance()),
new ProcessorEnumValue("msvc", DevStudioCCompiler.getInstance()),
new ProcessorEnumValue("bcc", BorlandCCompiler.getInstance()),
new ProcessorEnumValue("msrc", DevStudioResourceCompiler
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java b/src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java
index 0881055..49a3e35 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java
+++ b/src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java
@@ -59,6 +59,11 @@ public final class GccCCompiler extends GccCompatibleCCompiler {
sourceExtensions, headerExtensions, false,
new GccCCompiler("g77", sourceExtensions, headerExtensions, true,
null, false, null), false, null);
+// FREEHEP
+ private static final GccCCompiler gfortranInstance = new GccCCompiler("gfortran",
+ sourceExtensions, headerExtensions, false,
+ new GccCCompiler("gfortran", sourceExtensions, headerExtensions, true,
+ null, false, null), false, null);
private static final GccCCompiler gppInstance = new GccCCompiler("g++",
sourceExtensions, headerExtensions, false,
new GccCCompiler("g++", sourceExtensions, headerExtensions, true,
@@ -79,6 +84,13 @@ public final class GccCCompiler extends GccCompatibleCCompiler {
public static GccCCompiler getG77Instance() {
return g77Instance;
}
+// FREEHEP
+ /**
+ * Gets g95 adapter
+ */
+ public static GccCCompiler getGFortranInstance() {
+ return gfortranInstance;
+ }
/**
* Gets gpp adapter
*/