swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-01-17 00:04:52 -05:00
Code Issues Projects Releases Wiki Activity

add other paths for oracle java

Browse Source
This commit is contained in:
DarthArgus
2015-11-24 00:30:20 -06:00
parent 6be3472385
commit 9cf4eff1f4
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/linux/FindJNI.cmake
View File

@@ -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}")