kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: bug fix 1573

This commit is contained in:
Bill Hoffman 2005-02-09 22:46:33 -05:00
parent e63bdf6245
commit aa947ff48b
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/FindJNI.cmake
View File

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

1
Modules/FindJava.cmake
View File

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