Skip to content

O
opencv
Commit 8e21f808 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

cmake: allow custom OpenCV_ARCH / OpenCV_RUNTIME values

parent ac22d3c8
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
cmake/OpenCVDetectCXXCompiler.cmake
View file @ 8e21f808
......@@ -93,7 +93,9 @@ if(NOT DEFINED OpenCV_STATIC)
endif()
endif()
if(MSVC)
if(DEFINED OpenCV_ARCH AND DEFINED OpenCV_RUNTIME)
# custom overrided values
elseif(MSVC)
if(CMAKE_CL_64)
set(OpenCV_ARCH x64)
elseif((CMAKE_GENERATOR MATCHES "ARM") OR ("${arch_hint}" STREQUAL "ARM") OR (CMAKE_VS_EFFECTIVE_PLATFORMS MATCHES "ARM|arm"))
......
cmake/templates/OpenCVConfig.root-WIN32.cmake.in
View file @ 8e21f808
......@@ -57,7 +57,9 @@ if(NOT DEFINED OpenCV_CUDA)
endif()
endif()
if(MSVC)
if(DEFINED OpenCV_ARCH AND DEFINED OpenCV_RUNTIME)
# custom overrided values
elseif(MSVC)
if(CMAKE_CL_64)
set(OpenCV_ARCH x64)
elseif((CMAKE_GENERATOR MATCHES "ARM") OR ("${arch_hint}" STREQUAL "ARM") OR (CMAKE_VS_EFFECTIVE_PLATFORMS MATCHES "ARM|arm"))
......
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