Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cmake: fix find_library() for bzip2

Browse Source
pull/6100/head
Alexander Alekhin 9 years ago
parent 2c4ed7f8a5
commit b2ca10a81f
1 changed files with 1 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      cmake/OpenCVFindLibsVideo.cmake

6
cmake/OpenCVFindLibsVideo.cmake
Unescape View File

@ -224,11 +224,7 @@ if(WITH_FFMPEG)
if(HAVE_FFMPEG) if(HAVE_FFMPEG)
# Find the bzip2 library because it is required on some systems # Find the bzip2 library because it is required on some systems
FIND_LIBRARY(BZIP2_LIBRARIES NAMES bz2 bzip2) FIND_LIBRARY(BZIP2_LIBRARIES NAMES bz2 bzip2 libbz2.so.1)
if(NOT BZIP2_LIBRARIES)
# Do an other trial
FIND_FILE(BZIP2_LIBRARIES NAMES libbz2.so.1 PATHS /lib)
endif()
else() else()
find_path(FFMPEG_INCLUDE_DIR "libavformat/avformat.h" find_path(FFMPEG_INCLUDE_DIR "libavformat/avformat.h"
PATHS /usr/local /usr /opt PATHS /usr/local /usr /opt

Write Preview
Loading…
Cancel
Save