Skip to content

O
opencv
Commit 60ba6ef9 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #16163 from alalek:fix_16122

parents 3d60a9b9 424e1150
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
cmake/OpenCVDetectCXXCompiler.cmake
View file @ 60ba6ef9
...@@ -142,13 +142,13 @@ if(DEFINED OpenCV_ARCH AND DEFINED OpenCV_RUNTIME) ...@@ -142,13 +142,13 @@ if(DEFINED OpenCV_ARCH AND DEFINED OpenCV_RUNTIME)
elseif(MSVC) elseif(MSVC)
# see Modules/CMakeGenericSystem.cmake # see Modules/CMakeGenericSystem.cmake
if("${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)") if("${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)")
set(arch_hint "x64") set(OpenCV_ARCH "x64")
elseif("${CMAKE_GENERATOR_PLATFORM}" MATCHES "ARM64") elseif("${CMAKE_GENERATOR_PLATFORM}" MATCHES "ARM64")
set(arch_hint "ARM64") set(OpenCV_ARCH "ARM64")
elseif("${CMAKE_GENERATOR}" MATCHES "ARM") elseif("${CMAKE_GENERATOR}" MATCHES "ARM")
set(arch_hint "ARM") set(OpenCV_ARCH "ARM")
elseif("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") elseif("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
set(arch_hint "x64") set(OpenCV_ARCH "x64")
else() else()
set(OpenCV_ARCH x86) set(OpenCV_ARCH x86)
endif() endif()
......
cmake/templates/OpenCVConfig.root-WIN32.cmake.in
View file @ 60ba6ef9
...@@ -98,13 +98,13 @@ if(DEFINED OpenCV_ARCH AND DEFINED OpenCV_RUNTIME) ...@@ -98,13 +98,13 @@ if(DEFINED OpenCV_ARCH AND DEFINED OpenCV_RUNTIME)
elseif(MSVC) elseif(MSVC)
# see Modules/CMakeGenericSystem.cmake # see Modules/CMakeGenericSystem.cmake
if("${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)") if("${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)")
set(arch_hint "x64") set(OpenCV_ARCH "x64")
elseif("${CMAKE_GENERATOR_PLATFORM}" MATCHES "ARM64") elseif("${CMAKE_GENERATOR_PLATFORM}" MATCHES "ARM64")
set(arch_hint "ARM64") set(OpenCV_ARCH "ARM64")
elseif("${CMAKE_GENERATOR}" MATCHES "ARM") elseif("${CMAKE_GENERATOR}" MATCHES "ARM")
set(arch_hint "ARM") set(OpenCV_ARCH "ARM")
elseif("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") elseif("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
set(arch_hint "x64") set(OpenCV_ARCH "x64")
else() else()
set(OpenCV_ARCH x86) set(OpenCV_ARCH x86)
endif() endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment