Ver Fonte

ENH: have jni look more places on linux

Bill Hoffman há 17 anos atrás
pai
commit
7dcbe5e1f5
1 ficheiros alterados com 2 adições e 1 exclusões
  1. 2 1
      Modules/FindJNI.cmake

+ 2 - 1
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