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

ENH: More locations for Java

This commit is contained in:
Andy Cedilnik 2006-10-12 13:12:37 -04:00
parent e31dc3abe5
commit e607d5f7df
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/FindJNI.cmake
View File

@ -17,9 +17,15 @@ SET(JAVA_AWT_LIBRARY_DIRECTORIES
/usr/local/lib /usr/local/lib
/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/local/share/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 /usr/lib/j2sdk1.5-sun/jre/lib/i386
/opt/sun-jdk-1.5.0.04/jre/lib/amd64 /opt/sun-jdk-1.5.0.04/jre/lib/amd64
/usr/lib/java/jre/lib/amd64
/usr/local/lib/java/jre/lib/amd64
/usr/local/share/java/jre/lib/amd64
/usr/lib/j2sdk1.4-sun/jre/lib/amd64
/usr/lib/j2sdk1.5-sun/jre/lib/amd64
) )
SET(JAVA_AWT_INCLUDE_DIRECTORIES SET(JAVA_AWT_INCLUDE_DIRECTORIES
@ -30,6 +36,7 @@ SET(JAVA_AWT_INCLUDE_DIRECTORIES
/usr/local/include /usr/local/include
/usr/lib/java/include /usr/lib/java/include
/usr/local/lib/java/include /usr/local/lib/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

1
Modules/FindJava.cmake
View File

@ -22,6 +22,7 @@ SET(JAVA_BIN_PATH
/usr/share/java/bin /usr/share/java/bin
/usr/local/bin /usr/local/bin
/usr/local/java/bin /usr/local/java/bin
/usr/local/java/share/bin
/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