potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-07-02 22:43:35 +00:00
parent f296e22580
commit cd24a3ec45
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+2 -3
View File
@@ -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()
modules/CMakeLists.txt
+3 -1
View File
@@ -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)