2008-10-13 23:15:08 +02:00
|
|
|
--- Modules/FindJNI.cmake
|
|
|
|
|
+++ Modules/FindJNI.cmake
|
2009-01-08 17:57:46 +01:00
|
|
|
@@ -22,6 +22,13 @@
|
2008-10-13 23:15:08 +02:00
|
|
|
$ENV{JAVA_HOME}/jre/lib/i386
|
|
|
|
|
$ENV{JAVA_HOME}/jre/lib/amd64
|
|
|
|
|
$ENV{JAVA_HOME}/jre/lib/ppc
|
|
|
|
|
+ $ENV{JAVA_HOME}/jre/lib/ppc/classic
|
|
|
|
|
+ $ENV{JAVA_HOME}/jre/lib/ppc64/classic
|
2009-01-08 17:57:46 +01:00
|
|
|
+ $ENV{JAVA_HOME}/jre/lib/ia64
|
|
|
|
|
+ $ENV{JAVA_HOME}/jre/lib/s390
|
|
|
|
|
+ $ENV{JAVA_HOME}/jre/lib/s390/classic
|
|
|
|
|
+ $ENV{JAVA_HOME}/jre/lib/s390x
|
|
|
|
|
+ $ENV{JAVA_HOME}/jre/lib/s390x/classic
|
2008-10-13 23:15:08 +02:00
|
|
|
/usr/lib
|
|
|
|
|
/usr/local/lib
|
|
|
|
|
/usr/lib/jvm/java/lib
|
2009-01-08 17:57:46 +01:00
|
|
|
@@ -51,6 +58,7 @@
|
|
|
|
|
"${dir}"
|
|
|
|
|
"${dir}/client"
|
|
|
|
|
"${dir}/server"
|
|
|
|
|
+ "${dir}/jrockit"
|
|
|
|
|
)
|
|
|
|
|
ENDFOREACH(dir)
|
|
|
|
|
|
|
|
|
|
@@ -166,7 +174,12 @@
|
2008-10-13 23:15:08 +02:00
|
|
|
|
|
|
|
|
SET(JNI_INCLUDE_DIRS
|
|
|
|
|
${JAVA_INCLUDE_PATH}
|
|
|
|
|
- ${JAVA_INCLUDE_PATH2}
|
|
|
|
|
- ${JAVA_AWT_INCLUDE_PATH}
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
+if(JAVA_INCLUDE_PATH2)
|
|
|
|
|
+ SET(JNI_INCLUDE_DIRS ${JNI_INCLUDE_DIRS} ${JAVA_INCLUDE_PATH2})
|
|
|
|
|
+endif(JAVA_INCLUDE_PATH2)
|
|
|
|
|
+
|
|
|
|
|
+if(JAVA_AWT_INCLUDE_PATH)
|
|
|
|
|
+ SET(JNI_INCLUDE_DIRS ${JNI_INCLUDE_DIRS} ${JAVA_AWT_INCLUDE_PATH})
|
|
|
|
|
+endif(JAVA_AWT_INCLUDE_PATH)
|
