Update CMakeLists.txt and linux.sh
This commit is contained in:
parent
30f017c892
commit
b7974cd1b5
@ -12,8 +12,6 @@ endif()
|
|||||||
find_package(Td REQUIRED)
|
find_package(Td REQUIRED)
|
||||||
|
|
||||||
if (NOT JNI_FOUND)
|
if (NOT JNI_FOUND)
|
||||||
set(JAVA_AWT_LIBRARY NotNeeded)
|
|
||||||
set(JAVA_AWT_INCLUDE_PATH NotNeeded)
|
|
||||||
find_package(JNI REQUIRED)
|
find_package(JNI REQUIRED)
|
||||||
endif()
|
endif()
|
||||||
message(STATUS "Found JNI: ${JNI_INCLUDE_DIRS} ${JNI_LIBRARIES}")
|
message(STATUS "Found JNI: ${JNI_INCLUDE_DIRS} ${JNI_LIBRARIES}")
|
||||||
|
@ -21,7 +21,7 @@ mkdir $TD_BUILD_DIR || true
|
|||||||
mkdir $TDNATIVES_CPP_BUILD_DIR || true
|
mkdir $TDNATIVES_CPP_BUILD_DIR || true
|
||||||
|
|
||||||
# Install java and fix java paths
|
# Install java and fix java paths
|
||||||
sudo apt install --reinstall openjdk-11-jdk-headless
|
sudo apt install --reinstall openjdk-11-jdk -y
|
||||||
if [ "$TRAVIS_CPU_ARCH" = "arm64" ]; then
|
if [ "$TRAVIS_CPU_ARCH" = "arm64" ]; then
|
||||||
export TRAVIS_CPU_ARCH_STANDARD="aarch64"
|
export TRAVIS_CPU_ARCH_STANDARD="aarch64"
|
||||||
else
|
else
|
||||||
|
Loading…
x
Reference in New Issue
Block a user