Skip to content

Allow overriding Java version #1634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
haraldF merged 1 commit into from
Sep 10, 2025
Merged

Allow overriding Java version #1634

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion olp-cpp-sdk-core/cmake/android.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand All @@ -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)
Expand Down
Loading