summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2006-10-12 17:12:37 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2006-10-12 17:12:37 (GMT)
commite607d5f7df26f8e8c9efa0eece2be1662ca54725 (patch)
tree61bdbc66388b31ed5598401e72444bca421da72a /Modules
parente31dc3abe554cdae307d654df9a245d8e72f55d4 (diff)
downloadCMake-e607d5f7df26f8e8c9efa0eece2be1662ca54725.zip
CMake-e607d5f7df26f8e8c9efa0eece2be1662ca54725.tar.gz
CMake-e607d5f7df26f8e8c9efa0eece2be1662ca54725.tar.bz2
ENH: More locations for Java
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindJNI.cmake7
-rw-r--r--Modules/FindJava.cmake1
2 files changed, 8 insertions, 0 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 4fdbb28..848d442 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -17,9 +17,15 @@ SET(JAVA_AWT_LIBRARY_DIRECTORIES
/usr/local/lib
/usr/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.5-sun/jre/lib/i386
/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
@@ -30,6 +36,7 @@ SET(JAVA_AWT_INCLUDE_DIRECTORIES
/usr/local/include
/usr/lib/java/include
/usr/local/lib/java/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
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
index 5f7f6ff..a594450 100644
--- a/Modules/FindJava.cmake
+++ b/Modules/FindJava.cmake
@@ -22,6 +22,7 @@ SET(JAVA_BIN_PATH
/usr/share/java/bin
/usr/local/bin
/usr/local/java/bin
+ /usr/local/java/share/bin
/usr/java/j2sdk1.4.2_04
/usr/lib/j2sdk1.4-sun/bin
/usr/java/j2sdk1.4.2_09/bin