From 8d907d2e3239847299b9da808e290dcab94cbb3b Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Fri, 14 Dec 2018 00:15:57 +0000 Subject: [PATCH] cmake(java): add OPENCV_JAVA_SOURCE_VERSION/OPENCV_JAVA_TARGET_VERSION --- cmake/OpenCVDetectApacheAnt.cmake | 3 +++ modules/java/jar/CMakeLists.txt | 7 +++++++ modules/java/jar/build.xml.in | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/cmake/OpenCVDetectApacheAnt.cmake b/cmake/OpenCVDetectApacheAnt.cmake index 989cb4075b..2f8243838e 100644 --- a/cmake/OpenCVDetectApacheAnt.cmake +++ b/cmake/OpenCVDetectApacheAnt.cmake @@ -1,3 +1,6 @@ +set(OPENCV_JAVA_SOURCE_VERSION "" CACHE STRING "Java source version (javac Ant target)") +set(OPENCV_JAVA_TARGET_VERSION "" CACHE STRING "Java target version (javac Ant target)") + file(TO_CMAKE_PATH "$ENV{ANT_DIR}" ANT_DIR_ENV_PATH) file(TO_CMAKE_PATH "$ENV{ProgramFiles}" ProgramFiles_ENV_PATH) diff --git a/modules/java/jar/CMakeLists.txt b/modules/java/jar/CMakeLists.txt index d34a8e26bf..0e16e3b5eb 100644 --- a/modules/java/jar/CMakeLists.txt +++ b/modules/java/jar/CMakeLists.txt @@ -18,6 +18,13 @@ set(depends gen_opencv_java_source "${OPENCV_DEPHELPER}/gen_opencv_java_source") ocv_copyfiles_add_target(${the_module}_jar_source_copy JAVA_SRC_COPY "Copy Java(JAR) source files" ${depends}) set(depends ${the_module}_jar_source_copy "${OPENCV_DEPHELPER}/${the_module}_jar_source_copy") +if(OPENCV_JAVA_SOURCE_VERSION) + set(OPENCV_ANT_JAVAC_EXTRA_ATTRS "${OPENCV_ANT_JAVAC_EXTRA_ATTRS} source=\"${OPENCV_JAVA_SOURCE_VERSION}\"") +endif() +if(OPENCV_JAVA_TARGET_VERSION) + set(OPENCV_ANT_JAVAC_EXTRA_ATTRS "${OPENCV_ANT_JAVAC_EXTRA_ATTRS} target=\"${OPENCV_JAVA_TARGET_VERSION}\"") +endif() + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/build.xml.in" "${OPENCV_JAVA_DIR}/build.xml" @ONLY) list(APPEND depends "${OPENCV_JAVA_DIR}/build.xml") diff --git a/modules/java/jar/build.xml.in b/modules/java/jar/build.xml.in index d4f01931b2..41b55b76fc 100644 --- a/modules/java/jar/build.xml.in +++ b/modules/java/jar/build.xml.in @@ -11,7 +11,7 @@ - +