diff options
| author | Pawel Tomulik <ptomulik@meil.pw.edu.pl> | 2015-10-17 07:25:16 (GMT) |
|---|---|---|
| committer | Pawel Tomulik <ptomulik@meil.pw.edu.pl> | 2015-10-17 07:25:16 (GMT) |
| commit | ee7a6695240de8f36b24d2bd024da76617ec7890 (patch) | |
| tree | a3f4a88e2bae386e3137c76ca198608461b1cfda | |
| parent | 080663ec198503579048f297f2a4c154d13d169d (diff) | |
| download | SCons-ee7a6695240de8f36b24d2bd024da76617ec7890.zip SCons-ee7a6695240de8f36b24d2bd024da76617ec7890.tar.gz SCons-ee7a6695240de8f36b24d2bd024da76617ec7890.tar.bz2 | |
small enchancement to swig tool
| -rw-r--r-- | src/engine/SCons/Tool/swig.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/swig.py b/src/engine/SCons/Tool/swig.py index a315182..8828ef1 100644 --- a/src/engine/SCons/Tool/swig.py +++ b/src/engine/SCons/Tool/swig.py @@ -44,6 +44,8 @@ import SCons.Tool import SCons.Util import SCons.Node +swigs = [ 'swig', 'swig3.0', 'swig2.0' ] + SwigAction = SCons.Action.Action('$SWIGCOM', '$SWIGCOMSTR') def swigSuffixEmitter(env, source): @@ -160,7 +162,8 @@ def generate(env): java_file.add_action('.i', SwigAction) java_file.add_emitter('.i', _swigEmitter) - env['SWIG'] = 'swig' + if 'SWIG' not in env: + env['SWIG'] = env.Detect(swigs) or swigs[0] env['SWIGVERSION'] = _get_swig_version(env) env['SWIGFLAGS'] = SCons.Util.CLVar('') env['SWIGDIRECTORSUFFIX'] = '_wrap.h' |