浏览代码

ENH: bug fix 1573

Bill Hoffman 21 年之前
父节点
当前提交
aa947ff48b
共有 2 个文件被更改,包括 3 次插入0 次删除
  1. 2 0
      Modules/FindJNI.cmake
  2. 1 0
      Modules/FindJava.cmake

+ 2 - 0
Modules/FindJNI.cmake

@@ -15,6 +15,7 @@ SET(JAVA_AWT_LIBRARY_DIRECTORIES
   /usr/local/lib
   /usr/lib/java/jre/lib/i386
   /usr/local/lib/java/jre/lib/i386
+  /usr/lib/j2sdk1.4-sun/jre/lib/i386
   )
 
 SET(JAVA_AWT_INCLUDE_DIRECTORIES
@@ -24,6 +25,7 @@ SET(JAVA_AWT_INCLUDE_DIRECTORIES
   /usr/local/include
   /usr/lib/java/include
   /usr/local/lib/java/include
+  /usr/lib/j2sdk1.4-sun/include
   )
 
 FOREACH(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")

+ 1 - 0
Modules/FindJava.cmake

@@ -22,6 +22,7 @@ SET(JAVA_BIN_PATH
   /usr/local/bin
   /usr/local/java/bin
   /usr/java/j2sdk1.4.2_04
+  /usr/lib/j2sdk1.4-sun/bin
   )
 FIND_PROGRAM(JAVA_RUNTIME
   NAMES java