mirror of
https://github.com/opencv/opencv.git
synced 2025-08-06 06:26:29 +08:00
Merge pull request #7678 from dec1:tag_3.0.0
This commit is contained in:
commit
876c2c0efd
@ -19,8 +19,8 @@ add_subdirectory(tutorial-4-opencl)
|
||||
# hello-android sample
|
||||
if(HAVE_opencv_highgui)
|
||||
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_link_libraries(hello-android ${OPENCV_LINKER_LIBS} 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 opencv_imgproc)
|
||||
set_target_properties(hello-android PROPERTIES OUTPUT_NAME hello-android RUNTIME_OUTPUT_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")
|
||||
add_dependencies(opencv_android_examples hello-android)
|
||||
endif()
|
||||
|
Loading…
Reference in New Issue
Block a user