Skip to content

Commit e4fdb37

Browse files
authored
Allow overriding Java version (#1634)
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 <[email protected]>
1 parent d4a3d09 commit e4fdb37

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

olp-cpp-sdk-core/cmake/android.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ if(NOT ANDROID OR OLP_SDK_ENABLE_ANDROID_CURL)
1919
return()
2020
endif()
2121

22+
set(OLP_SDK_JAVA_TARGET "1.7" CACHE STRING "Java source and target version for Android network module")
23+
2224
add_definitions(-DOLP_SDK_NETWORK_HAS_ANDROID)
2325
set(NETWORK_ANDROID_LIBRARIES ${ANDROID_LIBRARY})
2426
include_directories(${ANDROID_INCLUDE_DIR})
@@ -32,7 +34,7 @@ if(CMAKE_HOST_WIN32 AND NOT WIN32)
3234
set(WIN32 TRUE)
3335
endif()
3436

35-
set(CMAKE_JAVA_COMPILE_FLAGS -source 1.7 -target 1.7)
37+
set(CMAKE_JAVA_COMPILE_FLAGS -source ${OLP_SDK_JAVA_TARGET} -target ${OLP_SDK_JAVA_TARGET})
3638
set(CMAKE_JAR_CLASSES_PREFIX com/here/olp/network)
3739

3840
include(${CMAKE_CURRENT_LIST_DIR}/GetAndroidVariables.cmake)

0 commit comments

Comments
 (0)