potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge pull request #4032 from mshabunin:fix-pkg-config

Browse Source
This commit is contained in:
Vadim Pisarevsky
2015-05-26 12:47:14 +00:00
parent dc587992a0 3863dc5b2b
commit 8fb37606f6
7 changed files with 105 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/highgui/CMakeLists.txt
+1 -1
View File
@@ -3,7 +3,7 @@ if (WINRT)
endif()
set(the_description "High-level GUI and Media I/O")
ocv_add_module(highgui opencv_imgproc opencv_imgcodecs opencv_videoio OPTIONAL opencv_androidcamera WRAP python)
ocv_add_module(highgui opencv_imgproc opencv_imgcodecs opencv_videoio WRAP python)
# ----------------------------------------------------------------------------
# CMake file for highgui. See root CMakeLists.txt
modules/ts/CMakeLists.txt
+1 -1
View File
@@ -9,7 +9,7 @@ set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef)
ocv_add_module(ts opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui)
ocv_add_module(ts INTERNAL opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui)
ocv_glob_module_sources()
ocv_module_include_directories()