Merge pull request #3745 from nitsch:fix-mingw-detection

b595812b · Vadim Pisarevsky · 0172bd6b · a5b293b4 · b595812b
Commit b595812b authored Mar 02, 2015 by Vadim Pisarevsky
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

OpenCVDetectCXXCompiler.cmake cmake/OpenCVDetectCXXCompiler.cmake +1 -5

No files found.
--- a/cmake/OpenCVDetectCXXCompiler.cmake
+++ b/cmake/OpenCVDetectCXXCompiler.cmake
@@ -144,11 +144,7 @@ if(MSVC)
 elseif(MINGW)
  set(OpenCV_RUNTIME mingw)
-  execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpmachine
+  if(MINGW64)
-                  OUTPUT_VARIABLE OPENCV_GCC_TARGET_MACHINE
-                  OUTPUT_STRIP_TRAILING_WHITESPACE)
-  if(CMAKE_OPENCV_GCC_TARGET_MACHINE MATCHES "64")
-    set(MINGW64 1)
    set(OpenCV_ARCH x64)
  else()
    set(OpenCV_ARCH x86)