1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00

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

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
+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)