by default, on Linux use own libjpeg, libpng, libtiff and/or libjasper if those libra...

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

diff --git a/opencv/3rdparty/CMakeLists.txt b/opencv/3rdparty/CMakeLists.txt
index 508ca7b94440fc960565030d061a426435cd019a..a492f13683af909167a393bc973fffb53f41d3cb 100644 (file)
--- a/opencv/3rdparty/CMakeLists.txt
+++ b/opencv/3rdparty/CMakeLists.txt
@@ -1,9 +1,15 @@
 add_subdirectory(flann)
 add_subdirectory(lapack)
 add_subdirectory(zlib)
-if(OPENCV_BUILD_3RDPARTY_LIBS)
-    add_subdirectory(libjasper)
-    add_subdirectory(libjpeg)
-    add_subdirectory(libpng)
-    add_subdirectory(libtiff)
+if(WITH_JASPER AND NOT JASPER_FOUND)
+       add_subdirectory(libjasper)
+endif()
+if(WITH_JPEG AND NOT JPEG_FOUND)
+       add_subdirectory(libjpeg)
+endif()
+if(WITH_PNG AND NOT PNG_FOUND)
+       add_subdirectory(libpng)
+endif()
+if(WITH_TIFF AND NOT TIFF_FOUND)
+       add_subdirectory(libtiff)
 endif()

diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
index 69bbcc7c078dc2d1d8901c86d94c07867ac05c9a..3bf8d50f9d25e69775d4f837d09d872b170afc69 100644 (file)
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -232,11 +232,12 @@ endif()
 # allow fine grained control over which libraries not to link, even if\r
 # they are available on the system\r
 # ====================================================================\r
+set(WITH_PNG ON CACHE BOOL "Include PNG support")\r
+set(WITH_JPEG ON CACHE BOOL "Include JPEG support")\r
+set(WITH_JASPER ON CACHE BOOL "Include JPEG2K support")\r
+set(WITH_TIFF ON CACHE BOOL "Include TIFF support")\r
+\r
 if(UNIX)\r
-    set(WITH_PNG ON CACHE BOOL "Include PNG support")\r
-    set(WITH_JPEG ON CACHE BOOL "Include JPEG support")\r
-    set(WITH_JASPER ON CACHE BOOL "Include JPEG2K support")\r
-    set(WITH_TIFF ON CACHE BOOL "Include TIFF support")\r
     set(WITH_FFMPEG ON CACHE BOOL "Include FFMPEG support")\r
     set(WITH_UNICAP ON CACHE BOOL "Include Unicap support")\r
     set(WITH_GTK ON CACHE BOOL "Include GTK support")\r
@@ -380,7 +381,7 @@ if(UNIX)
                 include(FindJasper)\r
             else()\r
                 set(JASPER_FOUND FALSE)\r
-            endif()          \r
+            endif()\r
             if(WITH_JPEG)\r
                 include(FindJPEG)\r
             else()\r
@@ -916,27 +917,40 @@ message(STATUS "    Linker flags (Release):    ${CMAKE_SHARED_LINKER_FLAGS} ${CM
 message(STATUS "    Linker flags (Debug):      ${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_DEBUG}")\r
 endif()\r
 \r
-if(UNIX)\r
-if(NOT APPLE)\r
+if(UNIX AND NOT APPLE)\r
 message(STATUS "")\r
 message(STATUS "  GUI: ")\r
 message(STATUS "    GTK+ 2.x:                  ${HAVE_GTK}")\r
 message(STATUS "    GThread:                   ${HAVE_GTHREAD}")\r
 message(STATUS "")\r
-if(NOT OPENCV_BUILD_3RDPARTY_LIBS)\r
+endif()\r
+\r
 message(STATUS "  Image I/O: ")\r
+if(NOT WITH_JPEG OR JPEG_FOUND)\r
 message(STATUS "    JPEG:                      ${JPEG_FOUND}")\r
-message(STATUS "    PNG:                       ${PNG_FOUND}")\r
-message(STATUS "    TIFF:                      ${TIFF_FOUND}")\r
-message(STATUS "    JASPER:                    ${JASPER_FOUND}")\r
 else()\r
-message(STATUS "  Image I/O: ")\r
 message(STATUS "    JPEG:                      build")\r
+endif()\r
+\r
+if(NOT WIDTH_PNG OR PNG_FOUND)\r
+message(STATUS "    PNG:                       ${PNG_FOUND}")\r
+else()\r
 message(STATUS "    PNG:                       build")\r
+endif()\r
+\r
+if(NOT WITH_TIFF OR TIFF_FOUND)\r
+message(STATUS "    TIFF:                      ${TIFF_FOUND}")\r
+else()\r
 message(STATUS "    TIFF:                      build")\r
-message(STATUS "    JASPER:                    build")\r
 endif()\r
+\r
+if(NOT WITH_JASPER OR JASPER_FOUND)\r
+message(STATUS "    JPEG 2000:                 ${JASPER_FOUND}")\r
+else()\r
+message(STATUS "    JPEG 2000:                 build")\r
 endif()\r
+\r
+if(UNIX AND NOT APPLE)\r
 message(STATUS "")\r
 message(STATUS "  Video I/O: ")\r
 message(STATUS "    DC1394 1.x:                ${HAVE_DC1394}")\r
@@ -956,6 +970,7 @@ message(STATUS "    V4L/V4L2:                  ${HAVE_CAMV4L}/${HAVE_CAMV4L2}")
 endif()\r
 message(STATUS "    Xine:                      ${HAVE_XINE}")\r
 endif()\r
+\r
 message(STATUS "")\r
 message(STATUS "  Interfaces: ")\r
 if(PYTHONLIBS_FOUND AND BUILD_SWIG_PYTHON_SUPPORT)\r

diff --git a/opencv/src/highgui/CMakeLists.txt b/opencv/src/highgui/CMakeLists.txt
index d09b5d1a80ba8cb575a39722df67d55828ae60a7..0a94571296dab94cdc0e5862c3541f54db1caabd 100644 (file)
--- a/opencv/src/highgui/CMakeLists.txt
+++ b/opencv/src/highgui/CMakeLists.txt
@@ -85,25 +85,24 @@ if(UNIX)
                set(highgui_srcs ${highgui_srcs} cvcap_v4l.cpp)
        endif()
 
-    if(NOT APPLE AND NOT OPENCV_BUILD_3RDPARTY_LIBS)
-        if(JPEG_FOUND)
-            add_definitions(-DHAVE_JPEG)
-            include_directories(${JPEG_INCLUDE_DIR})
-        endif()
-        if(PNG_FOUND)
-            add_definitions(-DHAVE_PNG)
-            add_definitions(${PNG_DEFINITIONS})
-            include_directories(${PNG_INCLUDE_DIR})
-        endif()
-        if(TIFF_FOUND)
-            add_definitions(-DHAVE_TIFF)
-            include_directories(${TIFF_INCLUDE_DIR})
-        endif()
-        if(JASPER_FOUND)
-            add_definitions(-DHAVE_JASPER)
-            include_directories(${JASPER_INCLUDE_DIR})
-        endif()
-    endif()
+    if(JPEG_FOUND)
+               add_definitions(-DHAVE_JPEG)
+               include_directories(${JPEG_INCLUDE_DIR})
+       endif()
+    
+       if(PNG_FOUND)
+               add_definitions(-DHAVE_PNG)
+               add_definitions(${PNG_DEFINITIONS})
+               include_directories(${PNG_INCLUDE_DIR})
+       endif()
+       if(TIFF_FOUND)
+               add_definitions(-DHAVE_TIFF)
+               include_directories(${TIFF_INCLUDE_DIR})
+       endif()
+       if(JASPER_FOUND)
+               add_definitions(-DHAVE_JASPER)
+               include_directories(${JASPER_INCLUDE_DIR})
+       endif()
 
     foreach(P ${HIGHGUI_INCLUDE_DIRS})
         include_directories(${P})