mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

formating style and making changes accordingly to review

Browse Source
This commit is contained in:
tribta 2017-06-27 18:39:32 +01:00
parent fd91072990
commit 98849151a2
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/CMakeLists.txt
View File

@ -83,8 +83,6 @@ add_subdirectory(cpp)
add_subdirectory(dnn) add_subdirectory(dnn)
# FIXIT: can't use cvconfig.h in samples: add_subdirectory(gpu) # FIXIT: can't use cvconfig.h in samples: add_subdirectory(gpu)
add_subdirectory(java/tutorial_code)
add_subdirectory(opencl) add_subdirectory(opencl)
if(WIN32) if(WIN32)

29
samples/java/tutorial_code/CMakeLists.txt
View File

@ -2,7 +2,7 @@
# CMake file for Java tutorials compilation. # CMake file for Java tutorials compilation.
# #
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
if(NOT ANT_EXECUTABLE) if(NOT ANT_EXECUTABLE OR NOT TARGET opencv_java)
return() return()
endif() endif()
@ -10,31 +10,30 @@ project(compile_java_tutorials)
set(curdir "${CMAKE_CURRENT_SOURCE_DIR}") set(curdir "${CMAKE_CURRENT_SOURCE_DIR}")
set(opencv_tutorial_java_bin_dir "${CMAKE_CURRENT_BINARY_DIR}/.compiled") set(opencv_tutorial_java_bin_dir "${CMAKE_CURRENT_BINARY_DIR}/.compiled")
set(target_name "compile_java_tutorials")
set(TUTORIALS_DIRS "") set(TUTORIALS_DIRS "")
FILE(GLOB children RELATIVE ${curdir} ${curdir}/*/*) file(GLOB children RELATIVE ${curdir} ${curdir}/*/*)
FOREACH(child ${children}) foreach(child ${children})
if(IS_DIRECTORY ${curdir}/${child}) if(IS_DIRECTORY ${curdir}/${child})
FILE(GLOB contains_java_files "${child}/*.java") file(GLOB contains_java_files "${child}/*.java")
if(contains_java_files) if(contains_java_files)
LIST(APPEND TUTORIALS_DIRS ${child}) list(APPEND TUTORIALS_DIRS ${child})
endif() endif()
endif() endif()
ENDFOREACH() endforeach()
add_custom_target("${target_name}" ALL add_custom_target("${PROJECT_NAME}"
DEPENDS opencv_java DEPENDS opencv_java
) )
FOREACH(tutorial_dir ${TUTORIALS_DIRS}) foreach(TUTORIAL_DIR ${TUTORIALS_DIRS})
get_filename_component(tutorial_name ${tutorial_dir} NAME_WE) get_filename_component(TUTORIAL_NAME ${TUTORIAL_DIR} NAME_WE)
add_custom_command(TARGET "${target_name}" add_custom_command(TARGET "${PROJECT_NAME}"
COMMAND ${ANT_EXECUTABLE} -q COMMAND ${ANT_EXECUTABLE} -q
-DocvJarDir="${OpenCV_BINARY_DIR}/bin" -DocvJarDir="${OpenCV_BINARY_DIR}/bin"
-DsrcDir="${tutorial_dir}" -DsrcDir="${TUTORIAL_DIR}"
-DdstDir="${opencv_tutorial_java_bin_dir}/${tutorial_name}" -DdstDir="${opencv_tutorial_java_bin_dir}/${TUTORIAL_NAME}"
WORKING_DIRECTORY "${curdir}" WORKING_DIRECTORY "${curdir}"
COMMENT "Compile the tutorial: ${tutorial_name}" COMMENT "Compile the tutorial: ${TUTORIAL_NAME}"
) )
ENDFOREACH() endforeach()