Proper fix for ticket #47 - previous solution broke the compilation (at least under...

git-svn-id: https://code.ros.org/svn/opencv/trunk@2717 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
index ec19d9117f411c34faea4d38cf57c180ac8f830a..9a5db9cf7f786fa92b5329d82e216e2b48183c1c 100644 (file)
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -363,6 +363,12 @@ if(UNIX)
             set(HAVE_FFMPEG 1)\r
         endif()    \r
       endif()\r
+      # Find the bzip2 library because it is required on some systems\r
+      FIND_LIBRARY(BZIP2_LIBRARIES NAMES bz2 bzip2)\r
+      if(NOT BZIP2_LIBRARIES)\r
+        # Do an other trial\r
+        FIND_FILE(BZIP2_LIBRARIES NAMES libbz2.so.1 PATHS /lib)\r
+      endif()\r
     endif()\r
 \r
     if(WITH_1394)\r

diff --git a/opencv/src/highgui/CMakeLists.txt b/opencv/src/highgui/CMakeLists.txt
index 8055b403d1fd2cb037e53bda781ce5d19e9bb958..1d3bbbb16da653b80be8a1cd411a747c7d89c614 100644 (file)
--- a/opencv/src/highgui/CMakeLists.txt
+++ b/opencv/src/highgui/CMakeLists.txt
@@ -92,7 +92,9 @@ if(UNIX)
 
     if(HAVE_FFMPEG)
         set(highgui_srcs ${highgui_srcs} cvcap_ffmpeg.cpp)
-        set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} bz2)
+        if(BZIP2_LIBRARIES)
+            set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} ${BZIP2_LIBRARIES})
+        endif()
     endif()
     
     if(HAVE_PVAPI)