Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #16163 from alalek:fix_16122

Browse Source
pull/16165/head
Alexander Alekhin 5 years ago
parent 3d60a9b96c 424e1150ae
commit 60ba6ef916
2 changed files with 8 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      cmake/OpenCVDetectCXXCompiler.cmake
  2. 8
      cmake/templates/OpenCVConfig.root-WIN32.cmake.in

8
cmake/OpenCVDetectCXXCompiler.cmake
Unescape 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
Unescape 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()

Write Preview
Loading…
Cancel
Save