From b2ca10a81f8fbd6d9bddfb0d73b388a9459861ff Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Thu, 11 Feb 2016 12:57:10 +0300 Subject: [PATCH] cmake: fix find_library() for bzip2 --- cmake/OpenCVFindLibsVideo.cmake | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cmake/OpenCVFindLibsVideo.cmake b/cmake/OpenCVFindLibsVideo.cmake index 64642da..20e3151 100644 --- a/cmake/OpenCVFindLibsVideo.cmake +++ b/cmake/OpenCVFindLibsVideo.cmake @@ -224,11 +224,7 @@ if(WITH_FFMPEG) if(HAVE_FFMPEG) # Find the bzip2 library because it is required on some systems - FIND_LIBRARY(BZIP2_LIBRARIES NAMES bz2 bzip2) - if(NOT BZIP2_LIBRARIES) - # Do an other trial - FIND_FILE(BZIP2_LIBRARIES NAMES libbz2.so.1 PATHS /lib) - endif() + FIND_LIBRARY(BZIP2_LIBRARIES NAMES bz2 bzip2 libbz2.so.1) else() find_path(FFMPEG_INCLUDE_DIR "libavformat/avformat.h" PATHS /usr/local /usr /opt -- 2.7.4