exclude ffmpeg from static crt builds; correct TBB lib path on x64

cd24a3ec · Vadim Pisarevsky · f296e225 · cd24a3ec · cd24a3ec
Commit cd24a3ec authored Jul 02, 2011 by Vadim Pisarevsky
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

CMakeLists.txt CMakeLists.txt +2 -3

CMakeLists.txt modules/CMakeLists.txt +2 -0

No files found.
--- 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()                   
+                    elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86*|i386*|i686*)
-                    if(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86*|i386*|i686*)
                        set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/ia32")
                    endif()

--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -13,7 +13,9 @@ add_subdirectory(features2d)
 add_subdirectory(flann)
 if(MSVC OR MINGW)
+  if(NOT BUILD_WITH_STATIC_CRT)
     add_subdirectory(ffmpeg)
+  endif()
 endif()
 if(BUILD_TESTS)