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

cmake's still not always respecting JAVA_HOME

Browse Source
This commit is contained in:
DarthArgus
2016-02-10 10:19:13 -06:00
parent 150c0f4894
commit 0c84415392
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/linux/FindJNI.cmake
+6
View File
@@ -103,6 +103,10 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
${_JAVA_HOME}/jre/bin/classic
${_JAVA_HOME}/lib
${_JAVA_HOME}
/opt/java17/jre/lib/i386
/opt/java17/jre/lib
/opt/java17/jre
/opt/java17/lib
/usr/java/jre/lib/i386
/usr/java/jre/lib
/usr/lib
@@ -152,6 +156,8 @@ set(JAVA_AWT_INCLUDE_DIRECTORIES
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
${_JAVA_HOME}/include
/opt/java17/include
/opt/java17/jre/include
/usr/include
/usr/local/include
/usr/lib/java/include