From 7dcbe5e1f5da3a19d8f174b82eb30088319e7738 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Tue, 8 Apr 2008 16:09:36 -0400 Subject: ENH: have jni look more places on linux --- Modules/FindJNI.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index 027e54a..26f4734 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -26,12 +26,12 @@ SET(JAVA_AWT_LIBRARY_DIRECTORIES /usr/lib/j2sdk1.5-sun/jre/lib/i386 /opt/sun-jdk-1.5.0.04/jre/lib/amd64 /usr/lib/java/jre/lib/amd64 + /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/amd64 /usr/local/lib/java/jre/lib/amd64 /usr/local/share/java/jre/lib/amd64 /usr/lib/j2sdk1.4-sun/jre/lib/amd64 /usr/lib/j2sdk1.5-sun/jre/lib/amd64 ) - SET(JAVA_JVM_LIBRARY_DIRECTORIES) FOREACH(dir ${JAVA_AWT_LIBRARY_DIRECTORIES}) SET(JAVA_JVM_LIBRARY_DIRECTORIES @@ -52,6 +52,7 @@ SET(JAVA_AWT_INCLUDE_DIRECTORIES /usr/local/include /usr/lib/java/include /usr/local/lib/java/include + /usr/lib/jvm/java-6-sun-1.6.0.00/include /usr/local/share/java/include /usr/lib/j2sdk1.4-sun/include /usr/lib/j2sdk1.5-sun/include -- cgit v0.12