Use correct java version
This commit is contained in:
parent
278312db5b
commit
4a9e249b29
|
@ -54,14 +54,19 @@ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
|
||||||
#include_directories("${CROSS_OPENJDK_PATH}/include/linux")
|
#include_directories("${CROSS_OPENJDK_PATH}/include/linux")
|
||||||
|
|
||||||
SET(JAVA_HOME "/usr/lib/jvm/default-java/")
|
SET(JAVA_HOME "/usr/lib/jvm/default-java/")
|
||||||
SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-17-openjdk-arm64")
|
if(EXISTS "/usr/lib/jvm/java-17-openjdk-arm64")
|
||||||
|
SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-17-openjdk-arm64")
|
||||||
|
SET(JAVA_JVM_LIBRARY "${JAVA_CROSS_HOME}/lib/server/libjvm.so")
|
||||||
|
SET(JAVA_AWT_LIBRARY "${JAVA_CROSS_HOME}/lib/libawt.so")
|
||||||
|
else()
|
||||||
|
SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-8-openjdk-arm64")
|
||||||
|
SET(JAVA_JVM_LIBRARY "${JAVA_CROSS_HOME}/jre/lib/aarch64/server/libjvm.so")
|
||||||
|
SET(JAVA_AWT_LIBRARY "${JAVA_CROSS_HOME}/jre/lib/aarch64/libawt.so")
|
||||||
|
endif()
|
||||||
SET(JAVA_INCLUDE_PATH "${JAVA_HOME}/include")
|
SET(JAVA_INCLUDE_PATH "${JAVA_HOME}/include")
|
||||||
SET(JAVA_AWT_INCLUDE_PATH "${JAVA_HOME}/include")
|
SET(JAVA_AWT_INCLUDE_PATH "${JAVA_HOME}/include")
|
||||||
SET(JAVA_INCLUDE_PATH2 "${JAVA_HOME}/include/linux")
|
SET(JAVA_INCLUDE_PATH2 "${JAVA_HOME}/include/linux")
|
||||||
|
|
||||||
SET(JAVA_JVM_LIBRARY "${JAVA_CROSS_HOME}/lib/server/libjvm.so")
|
|
||||||
SET(JAVA_AWT_LIBRARY "${JAVA_CROSS_HOME}/lib/libawt.so")
|
|
||||||
|
|
||||||
|
|
||||||
# Only on aarch64 & armhf architecture
|
# Only on aarch64 & armhf architecture
|
||||||
set(CMAKE_THREAD_LIBS_INIT "-lpthread")
|
set(CMAKE_THREAD_LIBS_INIT "-lpthread")
|
||||||
|
|
|
@ -54,7 +54,11 @@ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
|
||||||
#include_directories("${CROSS_OPENJDK_PATH}/include/linux")
|
#include_directories("${CROSS_OPENJDK_PATH}/include/linux")
|
||||||
|
|
||||||
SET(JAVA_HOME "/usr/lib/jvm/default-java/")
|
SET(JAVA_HOME "/usr/lib/jvm/default-java/")
|
||||||
SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-17-openjdk-armhf")
|
if(EXISTS "/usr/lib/jvm/java-17-openjdk-armhf")
|
||||||
|
SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-17-openjdk-armhf")
|
||||||
|
else()
|
||||||
|
SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-8-openjdk-armhf")
|
||||||
|
endif()
|
||||||
SET(JAVA_INCLUDE_PATH "${JAVA_HOME}/include")
|
SET(JAVA_INCLUDE_PATH "${JAVA_HOME}/include")
|
||||||
SET(JAVA_AWT_INCLUDE_PATH "${JAVA_HOME}/include")
|
SET(JAVA_AWT_INCLUDE_PATH "${JAVA_HOME}/include")
|
||||||
SET(JAVA_INCLUDE_PATH2 "${JAVA_HOME}/include/linux")
|
SET(JAVA_INCLUDE_PATH2 "${JAVA_HOME}/include/linux")
|
||||||
|
|
|
@ -54,7 +54,11 @@ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
|
||||||
#include_directories("${CROSS_OPENJDK_PATH}/include/linux")
|
#include_directories("${CROSS_OPENJDK_PATH}/include/linux")
|
||||||
|
|
||||||
SET(JAVA_HOME "/usr/lib/jvm/default-java/")
|
SET(JAVA_HOME "/usr/lib/jvm/default-java/")
|
||||||
SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-17-openjdk-i386")
|
if(EXISTS "/usr/lib/jvm/java-17-openjdk-i386")
|
||||||
|
SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-8-openjdk-i386")
|
||||||
|
else()
|
||||||
|
SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-8-openjdk-i386")
|
||||||
|
endif()
|
||||||
SET(JAVA_INCLUDE_PATH "${JAVA_HOME}/include")
|
SET(JAVA_INCLUDE_PATH "${JAVA_HOME}/include")
|
||||||
SET(JAVA_AWT_INCLUDE_PATH "${JAVA_HOME}/include")
|
SET(JAVA_AWT_INCLUDE_PATH "${JAVA_HOME}/include")
|
||||||
SET(JAVA_INCLUDE_PATH2 "${JAVA_HOME}/include/linux")
|
SET(JAVA_INCLUDE_PATH2 "${JAVA_HOME}/include/linux")
|
||||||
|
|
|
@ -54,7 +54,11 @@ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
|
||||||
#include_directories("${CROSS_OPENJDK_PATH}/include/linux")
|
#include_directories("${CROSS_OPENJDK_PATH}/include/linux")
|
||||||
|
|
||||||
SET(JAVA_HOME "/usr/lib/jvm/default-java/")
|
SET(JAVA_HOME "/usr/lib/jvm/default-java/")
|
||||||
SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-17-openjdk-ppc64el")
|
if(EXISTS "/usr/lib/jvm/java-17-openjdk-ppc64el")
|
||||||
|
SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-8-openjdk-ppc64el")
|
||||||
|
else()
|
||||||
|
SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-8-openjdk-ppc64el")
|
||||||
|
endif()
|
||||||
SET(JAVA_INCLUDE_PATH "${JAVA_HOME}/include")
|
SET(JAVA_INCLUDE_PATH "${JAVA_HOME}/include")
|
||||||
SET(JAVA_AWT_INCLUDE_PATH "${JAVA_HOME}/include")
|
SET(JAVA_AWT_INCLUDE_PATH "${JAVA_HOME}/include")
|
||||||
SET(JAVA_INCLUDE_PATH2 "${JAVA_HOME}/include/linux")
|
SET(JAVA_INCLUDE_PATH2 "${JAVA_HOME}/include/linux")
|
||||||
|
|
|
@ -54,7 +54,11 @@ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
|
||||||
#include_directories("${CROSS_OPENJDK_PATH}/include/linux")
|
#include_directories("${CROSS_OPENJDK_PATH}/include/linux")
|
||||||
|
|
||||||
SET(JAVA_HOME "/usr/lib/jvm/default-java/")
|
SET(JAVA_HOME "/usr/lib/jvm/default-java/")
|
||||||
SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-17-openjdk-riscv64")
|
if(EXISTS "/usr/lib/jvm/java-17-openjdk-riscv64")
|
||||||
|
SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-8-openjdk-riscv64")
|
||||||
|
else()
|
||||||
|
SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-8-openjdk-riscv64")
|
||||||
|
endif()
|
||||||
SET(JAVA_INCLUDE_PATH "${JAVA_HOME}/include")
|
SET(JAVA_INCLUDE_PATH "${JAVA_HOME}/include")
|
||||||
SET(JAVA_AWT_INCLUDE_PATH "${JAVA_HOME}/include")
|
SET(JAVA_AWT_INCLUDE_PATH "${JAVA_HOME}/include")
|
||||||
SET(JAVA_INCLUDE_PATH2 "${JAVA_HOME}/include/linux")
|
SET(JAVA_INCLUDE_PATH2 "${JAVA_HOME}/include/linux")
|
||||||
|
|
Loading…
Reference in New Issue
Block a user