Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts: modules/cudaimgproc/test/test_color.cpp modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp modules/gpu/perf/perf_imgproc.cpp modules/gpu/src/imgproc.cpp modules/gpu/test/test_core.cpp modules/gpu/test/test_imgproc.cpp modules/java/generator/src/cpp/VideoCapture.cpp samples/gpu/performance/CMakeLists.txt samples/tapi/CMakeLists.txt
This commit is contained in:
@@ -102,6 +102,6 @@ endif()
|
||||
if(INSTALL_C_EXAMPLES AND NOT WIN32)
|
||||
file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
|
||||
install(FILES ${C_SAMPLES}
|
||||
DESTINATION share/OpenCV/samples/cpp
|
||||
DESTINATION ${OPENCV_SAMPLES_SRC_INSTALL_PATH}/cpp
|
||||
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
|
||||
endif()
|
||||
|
Reference in New Issue
Block a user