diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-04-01 21:41:07 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-04-01 21:41:07 (GMT) |
| commit | 6759959aacf334da3589fb62a1d18899a652ebbd (patch) | |
| tree | 877252a99a64218d83627ca88613f33b9cac392b /QMTest | |
| parent | 6b5a4152a892c3a66943ae7afdec2b28c71a08a0 (diff) | |
| download | SCons-6759959aacf334da3589fb62a1d18899a652ebbd.zip SCons-6759959aacf334da3589fb62a1d18899a652ebbd.tar.gz SCons-6759959aacf334da3589fb62a1d18899a652ebbd.tar.bz2 | |
updates to finding java includes to work with oracle java 8 on linux
Diffstat (limited to 'QMTest')
| -rw-r--r-- | QMTest/TestSCons.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 6b087c0..ee10508 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -712,7 +712,8 @@ class TestSCons(TestCommon): if not version: version='' jni_dirs = ['/System/Library/Frameworks/JavaVM.framework/Headers/jni.h', - '/usr/lib/jvm/default-java/include/jni.h'] + '/usr/lib/jvm/default-java/include/jni.h', + '/usr/lib/jvm/java-*-oracle/include/jni.h'] else: jni_dirs = ['/System/Library/Frameworks/JavaVM.framework/Versions/%s*/Headers/jni.h'%version] jni_dirs.extend(['/usr/lib/jvm/java-*-sun-%s*/include/jni.h'%version, |