diff options
Diffstat (limited to 'recipes-support/opencv/opencv/0001-Make-ts-module-external.patch')
-rw-r--r-- | recipes-support/opencv/opencv/0001-Make-ts-module-external.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch b/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch new file mode 100644 index 00000000..d56b8ae6 --- /dev/null +++ b/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 11bbf909e08594628bd757d989ae34cf1bfe200b Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
3 | Date: Thu, 18 Jun 2020 05:51:38 +0000 | ||
4 | Subject: [PATCH] Make ts module external | ||
5 | |||
6 | Make ts module external | ||
7 | |||
8 | Reference: https://github.com/qbonnard/opencv/commit/6b229c5834cb9a0930425e762a6c7b03244d7abb | ||
9 | |||
10 | Upstream-Status: Submitted [https://github.com/opencv/opencv/issues/8408] | ||
11 | |||
12 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
13 | --- | ||
14 | modules/ts/CMakeLists.txt | 5 +---- | ||
15 | 1 file changed, 1 insertion(+), 4 deletions(-) | ||
16 | |||
17 | diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt | ||
18 | index f95bed0793..66f315bcca 100644 | ||
19 | --- a/modules/ts/CMakeLists.txt | ||
20 | +++ b/modules/ts/CMakeLists.txt | ||
21 | @@ -4,9 +4,6 @@ if(NOT BUILD_opencv_ts AND NOT BUILD_TESTS AND NOT BUILD_PERF_TESTS) | ||
22 | ocv_module_disable(ts) | ||
23 | endif() | ||
24 | |||
25 | -set(OPENCV_MODULE_TYPE STATIC) | ||
26 | -set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE) | ||
27 | - | ||
28 | if(WINRT) | ||
29 | # WINRT doesn't have access to environment variables | ||
30 | # so adding corresponding macros during CMake run | ||
31 | @@ -16,7 +13,7 @@ endif() | ||
32 | |||
33 | ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) | ||
34 | |||
35 | -ocv_add_module(ts INTERNAL opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui) | ||
36 | +ocv_add_module(ts opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui) | ||
37 | |||
38 | ocv_glob_module_sources() | ||
39 | ocv_module_include_directories() | ||
40 | -- | ||
41 | 2.24.1 | ||
42 | |||