cmake: allow custom OpenCV_ARCH / OpenCV_RUNTIME values

backport 8e21f808

cmake: allow custom OpenCV_ARCH / OpenCV_RUNTIME values
backport 8e21f808
fdefc4b0 · Alexander Alekhin · Alexander Alekhin · 61d82926 · fdefc4b0 · fdefc4b0
Commit fdefc4b0 authored Nov 07, 2017 by Alexander Alekhin Committed by Alexander Alekhin Jan 04, 2018
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

OpenCVConfig.cmake cmake/OpenCVConfig.cmake +3 -1

OpenCVDetectCXXCompiler.cmake cmake/OpenCVDetectCXXCompiler.cmake +3 -1

No files found.
--- 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()