Skip to content

O
opencv
Commit aef8e6ba authored by Andrey Kamaev's avatar Andrey Kamaev Committed by OpenCV Buildbot
Browse files
Options

Merge pull request #782 from taka-no-me:bitness_detection

parents 6d7313cd d3083ecf
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
cmake/OpenCVDetectCXXCompiler.cmake
View file @ aef8e6ba
...@@ -99,7 +99,11 @@ elseif(CMAKE_COMPILER_IS_GNUCXX) ...@@ -99,7 +99,11 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
endif() endif()
endif() endif()
if(MINGW64 OR CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*" OR CMAKE_GENERATOR MATCHES "Visual Studio.*Win64") if(MSVC64 OR MINGW64)
set(X86_64 1)
elseif(MSVC AND NOT CMAKE_CROSSCOMPILING)
set(X86 1)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
set(X86_64 1) set(X86_64 1)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|AMD64.*") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|AMD64.*")
set(X86 1) set(X86 1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment