Commit bcd62c80 authored by Bill Hoffman's avatar Bill Hoffman

ENH: add support for java 1.5

parent db1903df
......@@ -46,6 +46,8 @@ IF(NOT CMAKE_Java_COMPILER)
/usr/local/bin
/usr/local/java/bin
/usr/java/j2sdk1.4.2_04
/usr/lib/j2sdk1.4-sun/bin
/usr/lib/j2sdk1.5-sun/bin
)
# if no compiler has been specified yet, then look for one
IF(CMAKE_Java_COMPILER_INIT)
......
......@@ -16,6 +16,7 @@ SET(JAVA_AWT_LIBRARY_DIRECTORIES
/usr/lib/java/jre/lib/i386
/usr/local/lib/java/jre/lib/i386
/usr/lib/j2sdk1.4-sun/jre/lib/i386
/usr/lib/j2sdk1.5-sun/jre/lib/i386
)
SET(JAVA_AWT_INCLUDE_DIRECTORIES
......@@ -26,6 +27,7 @@ SET(JAVA_AWT_INCLUDE_DIRECTORIES
/usr/lib/java/include
/usr/local/lib/java/include
/usr/lib/j2sdk1.4-sun/include
/usr/lib/j2sdk1.5-sun/include
)
FOREACH(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")
......
......@@ -24,6 +24,7 @@ SET(JAVA_BIN_PATH
/usr/java/j2sdk1.4.2_04
/usr/lib/j2sdk1.4-sun/bin
/usr/java/j2sdk1.4.2_09/bin
/usr/lib/j2sdk1.5-sun/bin
)
FIND_PROGRAM(JAVA_RUNTIME
NAMES java
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment