From 8378ba7554be90bb2c08b0b908c2924223a543fd Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Fri, 22 Jul 2011 14:11:16 +0000 Subject: [PATCH] Fixed Android package build --- modules/java/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt index 81e29442f9..c26334a297 100644 --- a/modules/java/CMakeLists.txt +++ b/modules/java/CMakeLists.txt @@ -136,7 +136,6 @@ foreach(java_file ${documented_java_files}) OUTPUT "${JAVA_OUTPUT_DIR}/${java_file_name}" COMMAND ${CMAKE_COMMAND} -E copy "${java_file}" "${JAVA_OUTPUT_DIR}/${java_file_name}" DEPENDS "${java_file}" - DEPENDS "${JAVA_OUTPUT_DIR}" COMMENT "Generating src/org/opencv/${java_file_name}" ) list(APPEND java_files "${JAVA_OUTPUT_DIR}/${java_file_name}") @@ -203,6 +202,10 @@ if(ANDROID) ) SET_SOURCE_FILES_PROPERTIES("${CMAKE_BINARY_DIR}/${file_rel}" PROPERTIES HEADER_FILE_ONLY TRUE) list(APPEND opencv_java_dependency_files "${CMAKE_BINARY_DIR}/${file_rel}") + + if(NOT file_rel MATCHES "jni/.+") + install(FILES "${CMAKE_BINARY_DIR}/${file_rel}" DESTINATION . COMPONENT main) + endif() endif() endforeach() -- GitLab