summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>2018-02-20 18:54:43 +0000
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>2018-02-20 18:54:43 +0000
commit5f5fcef962ad095125e6ca41cb03557b826a1123 (patch)
treebe2014e33464b8f2f55ce9761f1a27f40c6c8c4c
parent12ce6b5c1557b90ffd077b6529649fe218ce8e60 (diff)
parent807ec00b857651a75e633c6f330a30c77590bdde (diff)
downloadopencv-5f5fcef962ad095125e6ca41cb03557b826a1123.tar.gz
opencv-5f5fcef962ad095125e6ca41cb03557b826a1123.tar.bz2
opencv-5f5fcef962ad095125e6ca41cb03557b826a1123.zip
Merge pull request #10907 from alalek:cmake_ninja_fix
-rw-r--r--modules/java/jar/CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/java/jar/CMakeLists.txt b/modules/java/jar/CMakeLists.txt
index 4771900848..d34a8e26bf 100644
--- a/modules/java/jar/CMakeLists.txt
+++ b/modules/java/jar/CMakeLists.txt
@@ -21,7 +21,9 @@ set(depends ${the_module}_jar_source_copy "${OPENCV_DEPHELPER}/${the_module}_jar
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/build.xml.in" "${OPENCV_JAVA_DIR}/build.xml" @ONLY)
list(APPEND depends "${OPENCV_JAVA_DIR}/build.xml")
+ocv_cmake_byproducts(__byproducts BYPRODUCTS "${OPENCV_JAR_FILE}")
add_custom_command(OUTPUT "${OPENCV_DEPHELPER}/${the_module}_jar"
+ ${__byproducts} # required for add_custom_target() by ninja
COMMAND ${ANT_EXECUTABLE} -noinput -k jar
COMMAND ${CMAKE_COMMAND} -E touch "${OPENCV_DEPHELPER}/${the_module}_jar"
WORKING_DIRECTORY "${OPENCV_JAVA_DIR}"