From 290b0f94b597f5a833f59cc8f70f1627bf8d1aa9 Mon Sep 17 00:00:00 2001 From: Marc Chevrier Date: Tue, 25 Aug 2015 09:31:30 +0200 Subject: [PATCH] FindJNI: Add support for SuSE platform and IBM Java SDK --- Modules/FindJNI.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index d31fea3f4..6958a2af1 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -156,6 +156,9 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES /usr/local/jre-1.7.0/lib/{libarch} /usr/local/jdk-1.6.0/jre/lib/{libarch} /usr/local/jre-1.6.0/lib/{libarch} + # SuSE specific paths for default JVM + /usr/lib64/jvm/java/jre/lib/{libarch} + /usr/lib64/jvm/jre/lib/{libarch} ) set(JAVA_JVM_LIBRARY_DIRECTORIES) @@ -164,6 +167,9 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES}) "${dir}" "${dir}/client" "${dir}/server" + # IBM SDK, Java Technology Edition, specific paths + "${dir}/j9vm" + "${dir}/default" ) endforeach() @@ -193,6 +199,8 @@ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES # OpenBSD specific path for default JVM /usr/local/jdk-1.7.0/include /usr/local/jdk-1.6.0/include + # SuSE specific paths for default JVM + /usr/lib64/jvm/java/include ) foreach(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")