From 134872bf4835dd4dc86ad69c2a11692829585fcb Mon Sep 17 00:00:00 2001 From: Harald Fernengel Date: Tue, 9 Sep 2025 12:06:44 +0300 Subject: [PATCH] Allow overriding Java version More recent Java compilers can't generate for target 1.7, so allow overriding the version via OLP_SDK_JAVA_TARGET. Relates-To: MINOR Signed-off-by: Harald Fernengel --- olp-cpp-sdk-core/cmake/android.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/olp-cpp-sdk-core/cmake/android.cmake b/olp-cpp-sdk-core/cmake/android.cmake index 53a2bc584..841d12ef4 100644 --- a/olp-cpp-sdk-core/cmake/android.cmake +++ b/olp-cpp-sdk-core/cmake/android.cmake @@ -19,6 +19,8 @@ if(NOT ANDROID OR OLP_SDK_ENABLE_ANDROID_CURL) return() endif() +set(OLP_SDK_JAVA_TARGET "1.7" CACHE STRING "Java source and target version for Android network module") + add_definitions(-DOLP_SDK_NETWORK_HAS_ANDROID) set(NETWORK_ANDROID_LIBRARIES ${ANDROID_LIBRARY}) include_directories(${ANDROID_INCLUDE_DIR}) @@ -32,7 +34,7 @@ if(CMAKE_HOST_WIN32 AND NOT WIN32) set(WIN32 TRUE) endif() -set(CMAKE_JAVA_COMPILE_FLAGS -source 1.7 -target 1.7) +set(CMAKE_JAVA_COMPILE_FLAGS -source ${OLP_SDK_JAVA_TARGET} -target ${OLP_SDK_JAVA_TARGET}) set(CMAKE_JAR_CLASSES_PREFIX com/here/olp/network) include(${CMAKE_CURRENT_LIST_DIR}/GetAndroidVariables.cmake)