Commit 876c2c0e authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #7678 from dec1:tag_3.0.0

parents c3f0ee07 a49e50a3
...@@ -19,8 +19,8 @@ add_subdirectory(tutorial-4-opencl) ...@@ -19,8 +19,8 @@ add_subdirectory(tutorial-4-opencl)
# hello-android sample # hello-android sample
if(HAVE_opencv_highgui) if(HAVE_opencv_highgui)
add_executable(hello-android hello-android/main.cpp) add_executable(hello-android hello-android/main.cpp)
ocv_target_include_modules_recurse(hello-android opencv_imgcodecs opencv_videoio opencv_highgui opencv_core) ocv_target_include_modules_recurse(hello-android opencv_imgcodecs opencv_videoio opencv_highgui opencv_core opencv_imgproc)
ocv_target_link_libraries(hello-android ${OPENCV_LINKER_LIBS} opencv_imgcodecs opencv_videoio opencv_highgui opencv_core) ocv_target_link_libraries(hello-android ${OPENCV_LINKER_LIBS} opencv_imgcodecs opencv_videoio opencv_highgui opencv_core opencv_imgproc)
set_target_properties(hello-android PROPERTIES OUTPUT_NAME hello-android RUNTIME_OUTPUT_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}") set_target_properties(hello-android PROPERTIES OUTPUT_NAME hello-android RUNTIME_OUTPUT_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")
add_dependencies(opencv_android_examples hello-android) add_dependencies(opencv_android_examples hello-android)
endif() endif()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment