From aa947ff48b6cf78663c658b46f37105467c04aea Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Wed, 9 Feb 2005 22:46:33 -0500 Subject: ENH: bug fix 1573 --- Modules/FindJNI.cmake | 2 ++ Modules/FindJava.cmake | 1 + 2 files changed, 3 insertions(+) diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index b4c6cde..9a9f3ea 100644 --- a/Modules/FindJNI.cmake +++ b/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}") diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index eab8b0d..cc05b24 100644 --- a/Modules/FindJava.cmake +++ b/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 -- cgit v0.12