mirror of
https://github.com/nihui/opencv-mobile.git
synced 2025-09-26 20:41:56 +08:00
31 lines
1.7 KiB
Diff
31 lines
1.7 KiB
Diff
diff -Nuarp opencv-4.12.0.orig/cmake/OpenCVDetectCXXCompiler.cmake opencv-4.12.0/cmake/OpenCVDetectCXXCompiler.cmake
|
|
--- opencv-4.12.0.orig/cmake/OpenCVDetectCXXCompiler.cmake 2025-07-02 15:54:13.000000000 +0800
|
|
+++ opencv-4.12.0/cmake/OpenCVDetectCXXCompiler.cmake 2025-07-13 20:45:15.821962247 +0800
|
|
@@ -154,9 +154,9 @@ elseif(MSVC)
|
|
# see Modules/CMakeGenericSystem.cmake
|
|
if("${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)")
|
|
set(OpenCV_ARCH "x64")
|
|
- elseif("${CMAKE_GENERATOR_PLATFORM}" MATCHES "ARM64")
|
|
+ elseif("${CMAKE_GENERATOR_PLATFORM}" MATCHES "(ARM64|arm64)")
|
|
set(OpenCV_ARCH "ARM64")
|
|
- elseif("${CMAKE_GENERATOR}" MATCHES "ARM")
|
|
+ elseif("${CMAKE_GENERATOR_PLATFORM}" MATCHES "(ARM|arm)")
|
|
set(OpenCV_ARCH "ARM")
|
|
elseif("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
|
|
set(OpenCV_ARCH "x64")
|
|
diff -Nuarp opencv-4.12.0.orig/cmake/templates/OpenCVConfig.root-WIN32.cmake.in opencv-4.12.0/cmake/templates/OpenCVConfig.root-WIN32.cmake.in
|
|
--- opencv-4.12.0.orig/cmake/templates/OpenCVConfig.root-WIN32.cmake.in 2025-07-02 15:54:13.000000000 +0800
|
|
+++ opencv-4.12.0/cmake/templates/OpenCVConfig.root-WIN32.cmake.in 2025-07-13 20:45:15.822091762 +0800
|
|
@@ -99,9 +99,9 @@ elseif(MSVC)
|
|
# see Modules/CMakeGenericSystem.cmake
|
|
if("${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)")
|
|
set(OpenCV_ARCH "x64")
|
|
- elseif("${CMAKE_GENERATOR_PLATFORM}" MATCHES "ARM64")
|
|
+ elseif("${CMAKE_GENERATOR_PLATFORM}" MATCHES "(ARM64|arm64)")
|
|
set(OpenCV_ARCH "ARM64")
|
|
- elseif("${CMAKE_GENERATOR}" MATCHES "ARM")
|
|
+ elseif("${CMAKE_GENERATOR_PLATFORM}" MATCHES "(ARM|arm)")
|
|
set(OpenCV_ARCH "ARM")
|
|
elseif("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
|
|
set(OpenCV_ARCH "x64")
|