third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16163 from alalek:fix_16122

Browse Source
This commit is contained in:
Alexander Alekhin 2019-12-14 18:51:21 +00:00
commit 60ba6ef916
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/OpenCVDetectCXXCompiler.cmake
View File

@ -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()

8
cmake/templates/OpenCVConfig.root-WIN32.cmake.in
View File

@ -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()