cmake: allow custom OpenCV_ARCH / OpenCV_RUNTIME values

alalek · alalek · commit fdefc4b09d1e · 2018-01-04T14:58:01.000Z
backport 8e21f80
diff --git 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)
diff --git 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()
