From b7974cd1b5bd90af5a9b6663451823d2e41b3629 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Wed, 19 Aug 2020 00:34:31 +0200 Subject: [PATCH] Update CMakeLists.txt and linux.sh --- src/tdnatives-cpp/CMakeLists.txt | 2 -- travis/linux.sh | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/tdnatives-cpp/CMakeLists.txt b/src/tdnatives-cpp/CMakeLists.txt index dd9066f..4bc02a6 100644 --- a/src/tdnatives-cpp/CMakeLists.txt +++ b/src/tdnatives-cpp/CMakeLists.txt @@ -12,8 +12,6 @@ endif() find_package(Td REQUIRED) if (NOT JNI_FOUND) - set(JAVA_AWT_LIBRARY NotNeeded) - set(JAVA_AWT_INCLUDE_PATH NotNeeded) find_package(JNI REQUIRED) endif() message(STATUS "Found JNI: ${JNI_INCLUDE_DIRS} ${JNI_LIBRARIES}") diff --git a/travis/linux.sh b/travis/linux.sh index 9789615..d089aa7 100644 --- a/travis/linux.sh +++ b/travis/linux.sh @@ -21,7 +21,7 @@ mkdir $TD_BUILD_DIR || true mkdir $TDNATIVES_CPP_BUILD_DIR || true # 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 export TRAVIS_CPU_ARCH_STANDARD="aarch64" else