Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cmake: allow custom OpenCV_ARCH / OpenCV_RUNTIME values

Browse Source
pull/10025/head
Alexander Alekhin 7 years ago
parent ac22d3c817
commit 8e21f808be
2 changed files with 6 additions and 2 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. 4
      cmake/OpenCVDetectCXXCompiler.cmake
  2. 4
      cmake/templates/OpenCVConfig.root-WIN32.cmake.in

4
cmake/OpenCVDetectCXXCompiler.cmake
Unescape View File

@ -93,7 +93,9 @@ if(NOT DEFINED OpenCV_STATIC)
endif() endif()
endif() endif()
if(MSVC) if(DEFINED OpenCV_ARCH AND DEFINED OpenCV_RUNTIME)
# custom overrided values
elseif(MSVC)
if(CMAKE_CL_64) if(CMAKE_CL_64)
set(OpenCV_ARCH x64) set(OpenCV_ARCH x64)
elseif((CMAKE_GENERATOR MATCHES "ARM") OR ("${arch_hint}" STREQUAL "ARM") OR (CMAKE_VS_EFFECTIVE_PLATFORMS MATCHES "ARM|arm")) elseif((CMAKE_GENERATOR MATCHES "ARM") OR ("${arch_hint}" STREQUAL "ARM") OR (CMAKE_VS_EFFECTIVE_PLATFORMS MATCHES "ARM|arm"))

4
cmake/templates/OpenCVConfig.root-WIN32.cmake.in
Unescape View File

@ -57,7 +57,9 @@ if(NOT DEFINED OpenCV_CUDA)
endif() endif()
endif() endif()
if(MSVC) if(DEFINED OpenCV_ARCH AND DEFINED OpenCV_RUNTIME)
# custom overrided values
elseif(MSVC)
if(CMAKE_CL_64) if(CMAKE_CL_64)
set(OpenCV_ARCH x64) set(OpenCV_ARCH x64)
elseif((CMAKE_GENERATOR MATCHES "ARM") OR ("${arch_hint}" STREQUAL "ARM") OR (CMAKE_VS_EFFECTIVE_PLATFORMS MATCHES "ARM|arm")) elseif((CMAKE_GENERATOR MATCHES "ARM") OR ("${arch_hint}" STREQUAL "ARM") OR (CMAKE_VS_EFFECTIVE_PLATFORMS MATCHES "ARM|arm"))

Write Preview
Loading…
Cancel
Save