From 51a5d22ab64129585f1825b8b66342224809549a Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sat, 1 Apr 2017 14:41:07 -0700 Subject: updates to finding java includes to work with oracle java 8 on linux --- QMTest/TestSCons.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'QMTest') diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 6b087c06..ee10508a 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, -- cgit v1.2.1