From 6be3472385078d20d76e2b8cc8b1a5850edfa470 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Mon, 23 Nov 2015 22:58:34 -0600 Subject: [PATCH 1/2] findjni: detect oracle java 6 ...later/todo, recode the java library cpp to properly use java 7/8/9+ --- cmake/linux/FindJNI.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/linux/FindJNI.cmake b/cmake/linux/FindJNI.cmake index b990be8f..84a46e6f 100644 --- a/cmake/linux/FindJNI.cmake +++ b/cmake/linux/FindJNI.cmake @@ -127,6 +127,7 @@ 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} + /usr/lib/jvm/java-6-oracle/jre/lib/{libarch} # This is to add Oracle Java 6 support. ) set(JAVA_JVM_LIBRARY_DIRECTORIES) @@ -163,6 +164,7 @@ set(JAVA_AWT_INCLUDE_DIRECTORIES # OpenBSD specific path for default JVM /usr/local/jdk-1.7.0/include /usr/local/jdk-1.6.0/include + /usr/lib/jvm/java-6-oracle/include # This is to add Oracle Java 6 support. ) foreach(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}") From 9cf4eff1f4ec7c0e2cc98f2c98fa834c7098cdc3 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Tue, 24 Nov 2015 00:30:20 -0600 Subject: [PATCH 2/2] add other paths for oracle java --- cmake/linux/FindJNI.cmake | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cmake/linux/FindJNI.cmake b/cmake/linux/FindJNI.cmake index 84a46e6f..e714ab3c 100644 --- a/cmake/linux/FindJNI.cmake +++ b/cmake/linux/FindJNI.cmake @@ -127,7 +127,11 @@ 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} - /usr/lib/jvm/java-6-oracle/jre/lib/{libarch} # This is to add Oracle Java 6 support. + # Webupd8 Oracle Java Paths for Debian and Ubuntu + /usr/lib/jvm/java-9-oracle/jre/lib/{libarch} + /usr/lib/jvm/java-8-oracle/jre/lib/{libarch} + /usr/lib/jvm/java-7-oracle/jre/lib/{libarch} + /usr/lib/jvm/java-6-oracle/jre/lib/{libarch} ) set(JAVA_JVM_LIBRARY_DIRECTORIES) @@ -164,7 +168,11 @@ set(JAVA_AWT_INCLUDE_DIRECTORIES # OpenBSD specific path for default JVM /usr/local/jdk-1.7.0/include /usr/local/jdk-1.6.0/include - /usr/lib/jvm/java-6-oracle/include # This is to add Oracle Java 6 support. + # Webupd8 Oracle Java Paths for Debian and Ubuntu + /usr/lib/jvm/java-9-oracle/include + /usr/lib/jvm/java-8-oracle/include + /usr/lib/jvm/java-7-oracle/include + /usr/lib/jvm/java-6-oracle/include ) foreach(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")