mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 20:42:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix modules deps

Browse Source
This commit is contained in:
Alexander Alekhin 2016-08-25 14:57:12 +03:00
parent b03e3abd62
commit 063ac74369
5 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/highgui/CMakeLists.txt
View File

@ -1,5 +1,5 @@
set(the_description "High-level GUI and Media I/O") set(the_description "High-level GUI and Media I/O")
ocv_add_module(highgui opencv_imgproc opencv_imgcodecs opencv_videoio WRAP python) ocv_add_module(highgui opencv_imgproc OPTIONAL opencv_imgcodecs opencv_videoio WRAP python)
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# CMake file for highgui. See root CMakeLists.txt # CMake file for highgui. See root CMakeLists.txt

4
modules/highgui/include/opencv2/highgui.hpp
View File

@ -44,8 +44,12 @@
#define __OPENCV_HIGHGUI_HPP__ #define __OPENCV_HIGHGUI_HPP__
#include "opencv2/core.hpp" #include "opencv2/core.hpp"
#ifdef HAVE_OPENCV_IMGCODECS
#include "opencv2/imgcodecs.hpp" #include "opencv2/imgcodecs.hpp"
#endif
#ifdef HAVE_OPENCV_VIDEOIO
#include "opencv2/videoio.hpp" #include "opencv2/videoio.hpp"
#endif
/** /**
@defgroup highgui High-level GUI @defgroup highgui High-level GUI

4
modules/highgui/include/opencv2/highgui/highgui_c.h
View File

@ -44,8 +44,12 @@
#include "opencv2/core/core_c.h" #include "opencv2/core/core_c.h"
#include "opencv2/imgproc/imgproc_c.h" #include "opencv2/imgproc/imgproc_c.h"
#ifdef HAVE_OPENCV_IMGCODECS
#include "opencv2/imgcodecs/imgcodecs_c.h" #include "opencv2/imgcodecs/imgcodecs_c.h"
#endif
#ifdef HAVE_OPENCV_VIDEOIO
#include "opencv2/videoio/videoio_c.h" #include "opencv2/videoio/videoio_c.h"
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

8
modules/highgui/src/precomp.hpp
View File

@ -47,12 +47,14 @@
#include "opencv2/core/utility.hpp" #include "opencv2/core/utility.hpp"
#include "opencv2/core/private.hpp" #include "opencv2/core/private.hpp"
#include "opencv2/imgcodecs.hpp"
#include "opencv2/imgproc/imgproc_c.h" #include "opencv2/imgproc/imgproc_c.h"
#include "opencv2/imgcodecs/imgcodecs_c.h"
#include "opencv2/highgui/highgui_c.h" #include "opencv2/highgui/highgui_c.h"
#ifdef HAVE_OPENCV_IMGCODECS
#include "opencv2/imgcodecs.hpp"
#include "opencv2/imgcodecs/imgcodecs_c.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

12
modules/highgui/test/test_precomp.hpp
View File

@ -6,16 +6,4 @@
# endif # endif
#endif #endif
#ifndef __OPENCV_TEST_PRECOMP_HPP__
#define __OPENCV_TEST_PRECOMP_HPP__
#include <iostream>
#include "opencv2/ts.hpp" #include "opencv2/ts.hpp"
//#include "opencv2/imgproc.hpp"
//#include "opencv2/imgcodecs.hpp"
//#include "opencv2/highgui.hpp"
//#include "opencv2/imgproc/imgproc_c.h"
//#include "opencv2/core/private.hpp"
#endif