diff options
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineJavaCompiler.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindJNI.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindJava.cmake | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/Modules/CMakeDetermineJavaCompiler.cmake b/Modules/CMakeDetermineJavaCompiler.cmake index 2c69ffe..da9d936 100644 --- a/Modules/CMakeDetermineJavaCompiler.cmake +++ b/Modules/CMakeDetermineJavaCompiler.cmake @@ -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) diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index 5668758..57cfe37 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -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}") diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index 093d1f2..ba59644 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -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 |