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

Fix for bug #9611, some more paths for OpenJDK.

This commit is contained in:
Bill Hoffman 2009-09-30 14:15:23 -04:00
parent c63e3bd13c
commit 122c7f6179
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/FindJNI.cmake
View File

@ -25,7 +25,7 @@
# (To distributed this file outside of CMake, substitute the full # (To distributed this file outside of CMake, substitute the full
# License text for the above reference.) # 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) MACRO(java_append_library_directories _var)
# Determine java arch-specific library subdir # Determine java arch-specific library subdir
IF (CMAKE_SYSTEM_NAME MATCHES "Linux") 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-6-sun/jre/lib/{libarch}
/usr/lib/jvm/java-1.5.0-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-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 # Debian specific paths for default JVM
/usr/lib/jvm/default-java/jre/lib/{libarch} /usr/lib/jvm/default-java/jre/lib/{libarch}
/usr/lib/jvm/default-java/jre/lib /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-6-sun/include
/usr/lib/jvm/java-1.5.0-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-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/local/share/java/include
/usr/lib/j2sdk1.4-sun/include /usr/lib/j2sdk1.4-sun/include
/usr/lib/j2sdk1.5-sun/include /usr/lib/j2sdk1.5-sun/include
/opt/sun-jdk-1.5.0.04/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}") FOREACH(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")