diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-09-30 18:15:23 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-09-30 18:15:23 (GMT) |
| commit | 122c7f61795fbe4d12d44c4faf0e0536058178c8 (patch) | |
| tree | 4d777f93fa0017b6fb66327332ecde3f9da446fb /Modules/FindJNI.cmake | |
| parent | c63e3bd13ca61778e78c5f715a44998fb30adb80 (diff) | |
| download | CMake-122c7f61795fbe4d12d44c4faf0e0536058178c8.zip CMake-122c7f61795fbe4d12d44c4faf0e0536058178c8.tar.gz CMake-122c7f61795fbe4d12d44c4faf0e0536058178c8.tar.bz2 | |
Fix for bug #9611, some more paths for OpenJDK.
Diffstat (limited to 'Modules/FindJNI.cmake')
| -rw-r--r-- | Modules/FindJNI.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index d080648..8c9523a 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -25,7 +25,7 @@ # (To distributed this file outside of CMake, substitute the full # License text for the above reference.) -# Expand $libarch occurences to java_libarch subdirectory(-ies) and set ${_var} +# Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var} MACRO(java_append_library_directories _var) # Determine java arch-specific library subdir IF (CMAKE_SYSTEM_NAME MATCHES "Linux") @@ -84,6 +84,7 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES /usr/lib/jvm/java-6-sun/jre/lib/{libarch} /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch} /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch} # can this one be removed according to #8821 ? Alex + /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch} # Debian specific paths for default JVM /usr/lib/jvm/default-java/jre/lib/{libarch} /usr/lib/jvm/default-java/jre/lib @@ -114,10 +115,13 @@ SET(JAVA_AWT_INCLUDE_DIRECTORIES /usr/lib/jvm/java-6-sun/include /usr/lib/jvm/java-1.5.0-sun/include /usr/lib/jvm/java-6-sun-1.6.0.00/include # can this one be removed according to #8821 ? Alex + /usr/lib/jvm/java-6-openjdk/include /usr/local/share/java/include /usr/lib/j2sdk1.4-sun/include /usr/lib/j2sdk1.5-sun/include /opt/sun-jdk-1.5.0.04/include + # Debian specific path for default JVM + /usr/lib/jvm/default-java/include ) FOREACH(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}") |