瀏覽代碼

ENH: add even more search directories for debian-like systems (see #8821)

Alex
Alexander Neundorf 17 年之前
父節點
當前提交
f1149df8cf
共有 1 個文件被更改,包括 8 次插入2 次删除
  1. 8 2
      Modules/FindJNI.cmake

+ 8 - 2
Modules/FindJNI.cmake

@@ -32,7 +32,11 @@ SET(JAVA_AWT_LIBRARY_DIRECTORIES
   /usr/lib/j2sdk1.4-sun/jre/lib/i386
   /usr/lib/j2sdk1.5-sun/jre/lib/i386
   /opt/sun-jdk-1.5.0.04/jre/lib/amd64
-  /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/amd64
+  /usr/lib/jvm/java-6-sun/jre/lib/i386
+  /usr/lib/jvm/java-6-sun/jre/lib/amd64
+  /usr/lib/jvm/java-1.5.0-sun/jre/lib/i386
+  /usr/lib/jvm/java-1.5.0-sun/jre/lib/amd64
+  /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/amd64       # can this one be removed according to #8821 ? Alex
   /usr/lib/java/jre/lib/amd64
   /usr/local/lib/java/jre/lib/amd64
   /usr/local/share/java/jre/lib/amd64
@@ -66,7 +70,9 @@ SET(JAVA_AWT_INCLUDE_DIRECTORIES
   /usr/lib/java/include
   /usr/local/lib/java/include
   /usr/lib/jvm/java/include
-  /usr/lib/jvm/java-6-sun-1.6.0.00/include
+  /usr/lib/jvm/java-6-sun/include
+  /usr/lib/jvm/java-1.5.0-sun/include
+  /usr/lib/jvm/java-6-sun-1.6.0.00/include       # can this one be removed according to #8821 ? Alex
   /usr/local/share/java/include
   /usr/lib/j2sdk1.4-sun/include
   /usr/lib/j2sdk1.5-sun/include