zishuo/opencv-mobile
1
0
Fork 0
mirror of https://github.com/nihui/opencv-mobile.git synced 2025-10-05 08:36:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 3.4.20 and 4.8.0 and some ci fix and highgui fix (#53)

Browse Source 
* update 3.4.20 patch

* update 4.8.0 patch

* update toolchain and ci

* split ios simulator

* fix wasm simd build

* enable cxx11 for opencv2

* workaround for macos build

* workaround for ios build

* do not convert RGB/BGR inplace on imencode/imwrite

* Update stb_image.h

* enable stbi neon

* Update highgui.cpp

* mac catalyst

* add test project

* opencv2 link openmp

* opencv 2.4.13.7 on newer msvc

* enable c++11 test

* test all packages
This commit is contained in:
nihui
2023-08-14 15:41:28 +08:00
committed by GitHub
parent 1b825e7721
commit fc1635bba6
21 changed files with 3484 additions and 1298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
opencv-3.4.20-link-openmp.patch Normal file
View File

@@ -0,0 +1,14 @@
diff -Nuarp opencv-3.4.20.orig/modules/core/CMakeLists.txt opencv-3.4.20/modules/core/CMakeLists.txt
--- opencv-3.4.20.orig/modules/core/CMakeLists.txt 2023-06-27 19:29:13.000000000 +0800
+++ opencv-3.4.20/modules/core/CMakeLists.txt 2023-08-13 19:39:56.659037366 +0800
@@ -31,6 +31,10 @@ if(HAVE_TBB)
list(APPEND extra_libs tbb)
endif()
+if(HAVE_OPENMP AND DEFINED OpenMP_CXX_LIBRARIES AND OpenMP_CXX_LIBRARIES)
+ list(APPEND extra_libs ${OpenMP_CXX_LIBRARIES})
+endif()
+
if(DEFINED WINRT AND NOT DEFINED ENABLE_WINRT_MODE_NATIVE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW")
endif()