From 57a66850eaa3b32c0bbcd22fd58deb5249505b2c Mon Sep 17 00:00:00 2001 From: Herb Kuta Date: Wed, 12 Jun 2019 12:17:17 -0700 Subject: [PATCH] DRAFT [thud] opencv_3.2: Make patch apply cleanly --- ...-ts-create-share-library-intead-of-static.patch | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/recipes-support/opencv/opencv/0001-Make-opencv-ts-create-share-library-intead-of-static.patch b/recipes-support/opencv/opencv/0001-Make-opencv-ts-create-share-library-intead-of-static.patch index 05ec41f..6283920 100644 --- a/recipes-support/opencv/opencv/0001-Make-opencv-ts-create-share-library-intead-of-static.patch +++ b/recipes-support/opencv/opencv/0001-Make-opencv-ts-create-share-library-intead-of-static.patch @@ -1,18 +1,19 @@ -From 49d1f7c40a5d097f23671318045ac54bc07846cf Mon Sep 17 00:00:00 2001 +From 533950c41fddc21052ecc06dc4ff557922c6d7cd Mon Sep 17 00:00:00 2001 From: Bian Naimeng Date: Wed, 19 Apr 2017 03:11:37 +0900 Subject: [PATCH] Make opencv-ts create share library intead of static. Signed-off-by: Lei Maohui + --- modules/ts/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt -index bb56da2..7bb4ce9 100644 +diff --git modules/ts/CMakeLists.txt modules/ts/CMakeLists.txt +index f95bed079..ee67858df 100644 --- a/modules/ts/CMakeLists.txt +++ b/modules/ts/CMakeLists.txt -@@ -4,7 +4,7 @@ if(IOS) +@@ -4,7 +4,7 @@ if(NOT BUILD_opencv_ts AND NOT BUILD_TESTS AND NOT BUILD_PERF_TESTS) ocv_module_disable(ts) endif() @@ -20,7 +21,4 @@ index bb56da2..7bb4ce9 100644 +#set(OPENCV_MODULE_TYPE STATIC) set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE) - ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) --- -1.8.4.2 - + if(WINRT)