diff options
| author | Steven Knight <knight@baldmt.com> | 2005-08-11 13:16:20 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2005-08-11 13:16:20 (GMT) |
| commit | 33f2e8d10b3f0334ab37ffb72bc4a282221dade6 (patch) | |
| tree | a33979bbdff3c760313ae8c17f5bdb74eb8e41bf /src | |
| parent | fc4d126d2bf4ef98b4ca552e8a15c8ce77b16191 (diff) | |
| download | SCons-33f2e8d10b3f0334ab37ffb72bc4a282221dade6.zip SCons-33f2e8d10b3f0334ab37ffb72bc4a282221dade6.tar.gz SCons-33f2e8d10b3f0334ab37ffb72bc4a282221dade6.tar.bz2 | |
Look up Fortran modules relative to . (Craig Scott)
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/fortran.py | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/fortran.xml | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 8d39946..cbc0a72 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -554,6 +554,11 @@ RELEASE 0.97 - XXX - Add a PathAccept validator to the list of new canned PathOption validators. + From Craig Scott: + + - Have the Fortran module emitter look for Fortan modules to be created + relative to $FORTRANMODDIR, not the top-level directory. + From Jeff Squyres: - Documentation changes: Use $CPPDEFINES instead of $CCFLAGS in man diff --git a/src/engine/SCons/Tool/fortran.py b/src/engine/SCons/Tool/fortran.py index 180c811..d559ac8 100644 --- a/src/engine/SCons/Tool/fortran.py +++ b/src/engine/SCons/Tool/fortran.py @@ -78,9 +78,10 @@ def _fortranEmitter(target, source, env): modules = SCons.Util.unique(modules) # Convert module name to a .mod filename suffix = env.subst('$FORTRANMODSUFFIX') + moddir = env.subst('$FORTRANMODDIR') modules = map(lambda x, s=suffix: string.lower(x) + s, modules) for m in modules: - target.append(env.fs.File(m)) + target.append(env.fs.File(m, moddir)) return (target, source) def FortranEmitter(target, source, env): diff --git a/src/engine/SCons/Tool/fortran.xml b/src/engine/SCons/Tool/fortran.xml index 4282f30..bfc34fa 100644 --- a/src/engine/SCons/Tool/fortran.xml +++ b/src/engine/SCons/Tool/fortran.xml @@ -65,7 +65,7 @@ of each directory in &cv-FORTRANPATH;. Directory location where the Fortran compiler should place any module files it generates. This variable is empty, by default. Some Fortran compilers will internally append this directory in the search path -for module files, as well +for module files, as well. </summary> </cvar> |