From cd24a3ec45cc6d764e113f72a3beefad79a06d09 Mon Sep 17 00:00:00 2001
From: Vadim Pisarevsky <no@email>
Date: Sat, 2 Jul 2011 22:43:35 +0000
Subject: [PATCH] exclude ffmpeg from static crt builds; correct TBB lib path
 on x64

---
 CMakeLists.txt         | 5 ++---
 modules/CMakeLists.txt | 4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 342c06c714..560bbb2185 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -710,10 +710,9 @@ if (WITH_TBB)
                 else()
                     get_filename_component(_TBB_LIB_PATH "${TBB_INCLUDE_DIR}/../lib" ABSOLUTE)                          
                    
-                    if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*|x86_64*)
+                    if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*|x86_64* OR MSVC64)
                         set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/intel64")
-                    endif()                   
-                    if(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86*|i386*|i686*)
+                    elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86*|i386*|i686*)
                         set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/ia32")
                     endif()
 
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index 77bb7d1a82..9e01bb3c7d 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -13,7 +13,9 @@ add_subdirectory(features2d)
 add_subdirectory(flann)
 
 if(MSVC OR MINGW)
-  add_subdirectory(ffmpeg)
+  if(NOT BUILD_WITH_STATIC_CRT)
+     add_subdirectory(ffmpeg)
+  endif()
 endif()
 
 if(BUILD_TESTS)