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

2015-03-02 10:55:00 +00:00 · 2015-03-02 10:55:00 +00:00 · b595812bd0
commit b595812bd0
parent 0172bd6beb a5b293b412
1 changed files with 1 additions and 5 deletions
--- 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
-                  OUTPUT_VARIABLE OPENCV_GCC_TARGET_MACHINE
-                  OUTPUT_STRIP_TRAILING_WHITESPACE)
-  if(CMAKE_OPENCV_GCC_TARGET_MACHINE MATCHES "64")
-    set(MINGW64 1)
+  if(MINGW64)
    set(OpenCV_ARCH x64)
  else()
    set(OpenCV_ARCH x86)