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

ENH: add support for java 1.5

Browse Source
This commit is contained in:
Bill Hoffman 2005-09-08 10:03:51 -04:00
parent db1903df89
commit bcd62c8091
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/CMakeDetermineJavaCompiler.cmake
View File

@ -46,6 +46,8 @@ IF(NOT CMAKE_Java_COMPILER)
/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
/usr/lib/j2sdk1.5-sun/bin
) )
# if no compiler has been specified yet, then look for one # if no compiler has been specified yet, then look for one
IF(CMAKE_Java_COMPILER_INIT) IF(CMAKE_Java_COMPILER_INIT)

2
Modules/FindJNI.cmake
View File

@ -16,6 +16,7 @@ SET(JAVA_AWT_LIBRARY_DIRECTORIES
/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 /usr/lib/j2sdk1.4-sun/jre/lib/i386
/usr/lib/j2sdk1.5-sun/jre/lib/i386
) )
SET(JAVA_AWT_INCLUDE_DIRECTORIES SET(JAVA_AWT_INCLUDE_DIRECTORIES
@ -26,6 +27,7 @@ SET(JAVA_AWT_INCLUDE_DIRECTORIES
/usr/lib/java/include /usr/lib/java/include
/usr/local/lib/java/include /usr/local/lib/java/include
/usr/lib/j2sdk1.4-sun/include /usr/lib/j2sdk1.4-sun/include
/usr/lib/j2sdk1.5-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

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