Fix bitness detection for target platform

12 years ago · d3083ecf6d
parent 5cfb6a848e
commit d3083ecf6d
1 changed files with 48 additions and 44 deletions
--- a/cmake/OpenCVDetectCXXCompiler.cmake
+++ b/cmake/OpenCVDetectCXXCompiler.cmake
@ -99,7 +99,11 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
  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)
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|AMD64.*")
  set(X86 1)