added "zip" option to the Package.cmake.in, fixed test failure in cvmorph when built...

[opencv.git] / opencv / CMakeLists.txt

diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
index c85938284ad9019a36a89e4118ea9c72440accc7..01830f34ed4a431c7b961bab7192a02a774c53ef 100644 (file)
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -88,9 +88,9 @@ endif()
 # Default: dynamic libraries:\r
 SET(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")\r
 IF(BUILD_SHARED_LIBS)\r
-       SET(OPENCV_BUILD_SHARED_LIB 1) # For cvconfig.h, etc.\r
+    SET(OPENCV_BUILD_SHARED_LIB 1) # For cvconfig.h, etc.\r
 ELSE(BUILD_SHARED_LIBS)\r
-       SET(OPENCV_BUILD_SHARED_LIB 0)\r
+    SET(OPENCV_BUILD_SHARED_LIB 0)\r
 ENDIF(BUILD_SHARED_LIBS)\r
 \r
 # ----------------------------------------------------------------------------\r
@@ -157,19 +157,19 @@ endif()
 #  the -fPIC flag should be used.\r
 # ----------------------------------------------------------------------------\r
 if(UNIX)\r
-       if  (__ICL)\r
-               set(CV_ICC   __ICL)\r
-       elseif(__ICC)\r
-               set(CV_ICC   __ICC)\r
-       elseif(__ECL)\r
-               set(CV_ICC   __ECL)\r
-       elseif(__ECC)\r
-               set(CV_ICC   __ECC)\r
-       elseif(__INTEL_COMPILER)\r
-               set(CV_ICC   __INTEL_COMPILER)\r
-       elseif(CMAKE_C_COMPILER MATCHES "icc")\r
-               set(CV_ICC   icc_matches_c_compiler)\r
-       endif()\r
+    if  (__ICL)\r
+        set(CV_ICC   __ICL)\r
+    elseif(__ICC)\r
+        set(CV_ICC   __ICC)\r
+    elseif(__ECL)\r
+        set(CV_ICC   __ECL)\r
+    elseif(__ECC)\r
+        set(CV_ICC   __ECC)\r
+    elseif(__INTEL_COMPILER)\r
+        set(CV_ICC   __INTEL_COMPILER)\r
+    elseif(CMAKE_C_COMPILER MATCHES "icc")\r
+        set(CV_ICC   icc_matches_c_compiler)\r
+    endif()\r
 endif()\r
 \r
 # ----------------------------------------------------------------------------\r
@@ -204,9 +204,9 @@ if(UNIX)
 endif()\r
 \r
 #if(MSVC)\r
-#      set(DEFAULT_ENABLE_OPENMP ON)\r
+#   set(DEFAULT_ENABLE_OPENMP ON)\r
 #else()\r
-#      set(DEFAULT_ENABLE_OPENMP OFF)\r
+#   set(DEFAULT_ENABLE_OPENMP OFF)\r
 #endif()\r
 #set(ENABLE_OPENMP ${DEFAULT_ENABLE_OPENMP} CACHE BOOL "")\r
 \r
@@ -264,19 +264,19 @@ set(WITH_TIFF ON CACHE BOOL "Include TIFF support")
 if(UNIX)\r
     set(WITH_FFMPEG ON CACHE BOOL "Include FFMPEG support")\r
     if(NOT APPLE)\r
-               set(WITH_UNICAP OFF CACHE BOOL "Include Unicap support (GPL)")\r
-       set(WITH_GTK ON CACHE BOOL "Include GTK support")\r
-       set(WITH_GSTREAMER ON CACHE BOOL "Include Gstreamer support")\r
-       set(WITH_V4L ON CACHE BOOL "Include Video 4 Linux support")\r
-       set(WITH_XINE OFF CACHE BOOL "Include Xine support (GPL)")\r
-       endif()\r
-       set(WITH_PVAPI ON CACHE BOOL "Include Prosilica GigE support")\r
-       set(WITH_1394 ON CACHE BOOL "Include IEEE1394 support")\r
+        set(WITH_UNICAP OFF CACHE BOOL "Include Unicap support (GPL)")\r
+        set(WITH_GTK ON CACHE BOOL "Include GTK support")\r
+        set(WITH_GSTREAMER ON CACHE BOOL "Include Gstreamer support")\r
+        set(WITH_V4L ON CACHE BOOL "Include Video 4 Linux support")\r
+        set(WITH_XINE OFF CACHE BOOL "Include Xine support (GPL)")\r
+    endif()\r
+    set(WITH_PVAPI ON CACHE BOOL "Include Prosilica GigE support")\r
+    set(WITH_1394 ON CACHE BOOL "Include IEEE1394 support")\r
 endif()\r
 \r
 if(APPLE)\r
-       set(WITH_CARBON OFF CACHE BOOL "Use Carbon for UI instead of Cocoa")\r
-       set(WITH_QUICKTIME OFF CACHE BOOL "Use QuickTime for Video I/O insted of QTKit")\r
+    set(WITH_CARBON OFF CACHE BOOL "Use Carbon for UI instead of Cocoa")\r
+    set(WITH_QUICKTIME OFF CACHE BOOL "Use QuickTime for Video I/O insted of QTKit")\r
 endif()\r
 \r
 set(WITH_TBB OFF CACHE BOOL "Include TBB support")\r
@@ -731,11 +731,11 @@ endif()
 \r
 if(CMAKE_COMPILER_IS_GNUCXX)\r
 \r
-       if(WIN32)\r
-               if(CMAKE_CXX_COMPILER MATCHES "64")\r
-                       set(MINGW64 1)\r
-               endif()\r
-       endif()\r
+    if(WIN32)\r
+        if(CMAKE_CXX_COMPILER MATCHES "64")\r
+            set(MINGW64 1)\r
+        endif()\r
+    endif()\r
 \r
     # High level of warnings.\r
     set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Wall")\r
@@ -757,13 +757,13 @@ if(CMAKE_COMPILER_IS_GNUCXX)
         set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Werror")\r
     endif()\r
 \r
-       if(X86)\r
+    if(X86)\r
         if(NOT X86_64)\r
             if(NOT APPLE)\r
                 set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -march=i686")\r
             endif()\r
         endif()\r
-       endif()\r
+    endif()\r
 \r
     # Other optimizations\r
     if(USE_OMIT_FRAME_POINTER)\r
@@ -835,11 +835,11 @@ endif()
 \r
 # Extra link libs if the user selects building static libs:\r
 IF(NOT BUILD_SHARED_LIBS)\r
-       if(CMAKE_COMPILER_IS_GNUCXX)\r
-               set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} stdc++)\r
-       endif()\r
+    if(CMAKE_COMPILER_IS_GNUCXX)\r
+        set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} stdc++)\r
+    endif()\r
 \r
-       set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} flann zlib opencv_lapack)\r
+    set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} flann zlib opencv_lapack)\r
 endif()\r
 \r
 \r
@@ -1114,7 +1114,7 @@ else()
 message(STATUS "  GUI Back-end:                Cocoa")\r
 endif()\r
 message(STATUS "")\r
-endif()        \r
+endif() \r
 \r
 message(STATUS "  Image I/O: ")\r
 if(NOT WITH_JPEG OR JPEG_FOUND)\r
@@ -1123,7 +1123,7 @@ else()
 message(STATUS "    JPEG:                      build")\r
 endif()\r
 \r
-if(NOT WIDTH_PNG OR PNG_FOUND)\r
+if(NOT WITH_PNG OR PNG_FOUND)\r
 message(STATUS "    PNG:                       ${PNG_FOUND}")\r
 else()\r
 message(STATUS "    PNG:                       build")\r