swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-08-02 02:15:58 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Update FindJNI to be able to locate Oracle java 



See merge request !23
This commit is contained in:
DarthArgus
2015-11-24 01:37:51 -05:00
parent b7a1668696 9cf4eff1f4
commit 0a402806a0
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/linux/FindJNI.cmake
+10
View File
@@ -127,6 +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}
# 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)
@@ -163,6 +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
# 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}")