mirror of
https://github.com/nihui/opencv-mobile.git
synced 2025-11-02 04:43:13 +08:00
fc1635bba6
* 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
29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
diff -Nuarp opencv-2.4.13.7.orig/cmake/OpenCVConfig.cmake opencv-2.4.13.7/cmake/OpenCVConfig.cmake
|
|
--- opencv-2.4.13.7.orig/cmake/OpenCVConfig.cmake 2018-07-02 20:41:56.000000000 +0800
|
|
+++ opencv-2.4.13.7/cmake/OpenCVConfig.cmake 2023-08-13 22:11:10.193931771 +0800
|
|
@@ -85,6 +85,10 @@ elseif(MSVC)
|
|
set(OpenCV_RUNTIME vc14)
|
|
elseif(MSVC_VERSION MATCHES "^191[0-9]$")
|
|
set(OpenCV_RUNTIME vc15)
|
|
+ elseif(MSVC_VERSION MATCHES "^192[0-9]$")
|
|
+ set(OpenCV_RUNTIME vc16)
|
|
+ elseif(MSVC_VERSION MATCHES "^193[0-9]$")
|
|
+ set(OpenCV_RUNTIME vc17)
|
|
endif()
|
|
elseif(MINGW)
|
|
set(OpenCV_RUNTIME mingw)
|
|
diff -Nuarp opencv-2.4.13.7.orig/cmake/OpenCVDetectCXXCompiler.cmake opencv-2.4.13.7/cmake/OpenCVDetectCXXCompiler.cmake
|
|
--- opencv-2.4.13.7.orig/cmake/OpenCVDetectCXXCompiler.cmake 2018-07-02 20:41:56.000000000 +0800
|
|
+++ opencv-2.4.13.7/cmake/OpenCVDetectCXXCompiler.cmake 2023-08-13 22:11:03.358965110 +0800
|
|
@@ -104,6 +104,10 @@ elseif(MSVC)
|
|
set(OpenCV_RUNTIME vc14)
|
|
elseif(MSVC_VERSION MATCHES "^191[0-9]$")
|
|
set(OpenCV_RUNTIME vc15)
|
|
+ elseif(MSVC_VERSION MATCHES "^192[0-9]$")
|
|
+ set(OpenCV_RUNTIME vc16)
|
|
+ elseif(MSVC_VERSION MATCHES "^193[0-9]$")
|
|
+ set(OpenCV_RUNTIME vc17)
|
|
endif()
|
|
elseif(MINGW)
|
|
set(OpenCV_RUNTIME mingw)
|