generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-03-02 10:55:00 +00:00
commit b595812bd0
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/OpenCVDetectCXXCompiler.cmake
View File

@ -144,11 +144,7 @@ if(MSVC)
elseif(MINGW) elseif(MINGW)
set(OpenCV_RUNTIME 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) set(OpenCV_ARCH x64)
else() else()
set(OpenCV_ARCH x86) set(OpenCV_ARCH x86)