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 tweaks

Browse Source
This commit is contained in:
DarthArgus
2018-05-02 16:28:10 +00:00
parent 631545b409
commit 9de2787107
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
-2
View File
@@ -1,5 +1,3 @@
cmake_policy(SET CMP0003 OLD) # or cmake_policy(VERSION 2.4)
cmake_minimum_required(VERSION 2.8)
project(stellabellum C CXX)
cmake/linux/FindJNI.cmake
+3
View File
@@ -89,6 +89,7 @@ get_filename_component(java_install_version
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
set(JAVA_AWT_LIBRARY_DIRECTORIES
/opt/oraclejava
/opt/java/lib
/opt/java
/opt/java/jre
@@ -100,6 +101,7 @@ set(JAVA_AWT_LIBRARY_DIRECTORIES
file(TO_CMAKE_PATH "$ENV{JAVA_HOME}" _JAVA_HOME)
JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
/opt/oraclejava
/opt/java
/opt/java/jre
/opt/java/jre/lib
@@ -161,6 +163,7 @@ endforeach()
set(JAVA_AWT_INCLUDE_DIRECTORIES
/opt/java/jre/include
/opt/oracle/jdk/include
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
"[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"