forked from pool/cmake
27 lines
726 B
Diff
27 lines
726 B
Diff
|
--- Modules/FindJNI.cmake
|
||
|
|
+++ Modules/FindJNI.cmake
|
||
|
|
@@ -22,6 +22,8 @@ SET(JAVA_AWT_LIBRARY_DIRECTORIES
|
||
|
|
$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
|
||
|
|
/usr/lib
|
||
|
|
/usr/local/lib
|
||
|
|
/usr/lib/jvm/java/lib
|
||
|
|
@@ -166,7 +168,12 @@ SET(JNI_LIBRARIES
|
||
|
|
|
||
|
|
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)
|