potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #2262 from SpecLad:merge-2.4

Browse Source
This commit is contained in:
Roman Donchenko
2014-02-03 15:33:40 +04:00
committed by OpenCV Buildbot
parent 0fef7f8b96 2bbda9d225
commit 652a0bd5ce
23 changed files with 216 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/java/CMakeLists.txt
+1 -1
View File
@@ -250,7 +250,7 @@ if(ANDROID)
else(ANDROID)
set(JAR_NAME opencv-${LIB_NAME_SUFIX}.jar)
set(JAR_FILE "${OpenCV_BINARY_DIR}/bin/${JAR_NAME}")
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/build.xml.in" "${OpenCV_BINARY_DIR}/build.xml" IMMEDIATE @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/build.xml.in" "${OpenCV_BINARY_DIR}/build.xml" @ONLY)
list(APPEND step3_depends "${OpenCV_BINARY_DIR}/build.xml")
add_custom_command(OUTPUT "${JAR_FILE}" "${JAR_FILE}.dephelper"