From fd51c133dfadac7b6d6724b77559e647a3c49357 Mon Sep 17 00:00:00 2001 From: vbystricky Date: Mon, 21 Jul 2014 15:10:41 +0400 Subject: [PATCH] Add depends from highgui to imgcodecs and videoio. And include header from imgcodecs and videoio to imgcodecs --- apps/traincascade/CMakeLists.txt | 2 +- modules/cudev/test/CMakeLists.txt | 2 +- modules/highgui/CMakeLists.txt | 2 +- modules/highgui/include/opencv2/highgui.hpp | 2 ++ modules/highgui/include/opencv2/highgui/highgui_c.h | 2 ++ samples/android/native-activity/CMakeLists.txt | 2 +- samples/directx/CMakeLists.txt | 2 +- samples/gpu/CMakeLists.txt | 2 +- 8 files changed, 10 insertions(+), 6 deletions(-) diff --git a/apps/traincascade/CMakeLists.txt b/apps/traincascade/CMakeLists.txt index c815303..cca5636 100644 --- a/apps/traincascade/CMakeLists.txt +++ b/apps/traincascade/CMakeLists.txt @@ -1,4 +1,4 @@ -set(OPENCV_TRAINCASCADE_DEPS opencv_core opencv_ml opencv_imgproc opencv_photo opencv_objdetect opencv_imgcodecs opencv_highgui opencv_calib3d opencv_video opencv_features2d) +set(OPENCV_TRAINCASCADE_DEPS opencv_core opencv_ml opencv_imgproc opencv_photo opencv_objdetect opencv_imgcodecs opencv_videoio opencv_highgui opencv_calib3d opencv_video opencv_features2d) ocv_check_dependencies(${OPENCV_TRAINCASCADE_DEPS}) if(NOT OCV_DEPENDENCIES_FOUND) diff --git a/modules/cudev/test/CMakeLists.txt b/modules/cudev/test/CMakeLists.txt index 438e0a6..363970e 100644 --- a/modules/cudev/test/CMakeLists.txt +++ b/modules/cudev/test/CMakeLists.txt @@ -1,4 +1,4 @@ -set(test_deps opencv_cudev opencv_core opencv_imgproc opencv_highgui opencv_ts ${OPENCV_MODULE_opencv_ts_DEPS}) +set(test_deps opencv_cudev opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui opencv_ts ${OPENCV_MODULE_opencv_ts_DEPS}) ocv_check_dependencies(${test_deps}) diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt index b0c93a8..78d6bfb 100644 --- a/modules/highgui/CMakeLists.txt +++ b/modules/highgui/CMakeLists.txt @@ -1,5 +1,5 @@ set(the_description "High-level GUI and Media I/O") -ocv_add_module(highgui opencv_imgproc opencv_imgcodecs OPTIONAL opencv_androidcamera) +ocv_add_module(highgui opencv_imgproc opencv_imgcodecs opencv_videoio OPTIONAL opencv_androidcamera) # ---------------------------------------------------------------------------- # CMake file for highgui. See root CMakeLists.txt diff --git a/modules/highgui/include/opencv2/highgui.hpp b/modules/highgui/include/opencv2/highgui.hpp index 3dfc7d7..2f98bcc 100644 --- a/modules/highgui/include/opencv2/highgui.hpp +++ b/modules/highgui/include/opencv2/highgui.hpp @@ -44,6 +44,8 @@ #define __OPENCV_HIGHGUI_HPP__ #include "opencv2/core.hpp" +#include "opencv2/imgcodecs.hpp" +#include "opencv2/videoio.hpp" ///////////////////////// graphical user interface ////////////////////////// diff --git a/modules/highgui/include/opencv2/highgui/highgui_c.h b/modules/highgui/include/opencv2/highgui/highgui_c.h index 2d3e6bc..57407b0 100644 --- a/modules/highgui/include/opencv2/highgui/highgui_c.h +++ b/modules/highgui/include/opencv2/highgui/highgui_c.h @@ -43,6 +43,8 @@ #define __OPENCV_HIGHGUI_H__ #include "opencv2/core/core_c.h" +#include "opencv2/imgcodecs/imgcodecs_c.h" +#include "opencv2/videoio/videoio_c.h" #ifdef __cplusplus extern "C" { diff --git a/samples/android/native-activity/CMakeLists.txt b/samples/android/native-activity/CMakeLists.txt index 1f6d974..0cc0571 100644 --- a/samples/android/native-activity/CMakeLists.txt +++ b/samples/android/native-activity/CMakeLists.txt @@ -3,7 +3,7 @@ set(sample example-native-activity) if(BUILD_FAT_JAVA_LIB) set(native_deps opencv_java) else() - set(native_deps opencv_highgui opencv_imgproc) + set(native_deps opencv_videoio opencv_imgcodecs opencv_highgui opencv_imgproc) endif() add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 9 ${ANDROID_SDK_TARGET} NATIVE_DEPS ${native_deps}) diff --git a/samples/directx/CMakeLists.txt b/samples/directx/CMakeLists.txt index 97d7fc3..1083894 100644 --- a/samples/directx/CMakeLists.txt +++ b/samples/directx/CMakeLists.txt @@ -1,4 +1,4 @@ -SET(OPENCV_DIRECTX_SAMPLES_REQUIRED_DEPS opencv_core opencv_imgproc opencv_imgcodecs opencv_highgui) +SET(OPENCV_DIRECTX_SAMPLES_REQUIRED_DEPS opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui) ocv_check_dependencies(${OPENCV_DIRECTX_SAMPLES_REQUIRED_DEPS}) diff --git a/samples/gpu/CMakeLists.txt b/samples/gpu/CMakeLists.txt index 87beb1b..849e310 100644 --- a/samples/gpu/CMakeLists.txt +++ b/samples/gpu/CMakeLists.txt @@ -1,4 +1,4 @@ -SET(OPENCV_CUDA_SAMPLES_REQUIRED_DEPS opencv_core opencv_flann opencv_imgproc opencv_imgcodecs opencv_highgui +SET(OPENCV_CUDA_SAMPLES_REQUIRED_DEPS opencv_core opencv_flann opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui opencv_ml opencv_video opencv_objdetect opencv_features2d opencv_calib3d opencv_legacy opencv_contrib opencv_cuda opencv_nonfree opencv_softcascade opencv_superres -- 2.7.4