cmake: allow custom OpenCV_ARCH / OpenCV_RUNTIME values

backport 8e21f808be
7 years ago · fdefc4b09d
parent 61d8292652
commit fdefc4b09d
2 changed files with 6 additions and 2 deletions
--- a/cmake/OpenCVConfig.cmake
+++ b/cmake/OpenCVConfig.cmake
@ -61,7 +61,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)
    set(OpenCV_TBB_ARCH intel64)
--- a/cmake/OpenCVDetectCXXCompiler.cmake
+++ b/cmake/OpenCVDetectCXXCompiler.cmake
@ -82,7 +82,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)
  else()