]> rtime.felk.cvut.cz Git - opencv.git/blobdiff - opencv/CMakeLists.txt
added "zip" option to the Package.cmake.in, fixed test failure in cvmorph when built...
[opencv.git] / opencv / CMakeLists.txt
index 85ca339e637bf3bf3424000dbaec938782b0a4ec..01830f34ed4a431c7b961bab7192a02a774c53ef 100644 (file)
 # ----------------------------------------------------------------------------\r
 \r
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)\r
-\r
+# Add these standard paths to the search paths for FIND_LIBRARY\r
+# to find libraries from these locations first\r
+if(UNIX)\r
+  set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib /usr/lib)\r
+endif()\r
 # it _must_ go before PROJECT(OpenCV) in order to work\r
 if (NOT CMAKE_INSTALL_PREFIX)\r
     if (WIN32)\r
@@ -56,7 +60,7 @@ endif()
 # ----------------------------------------------------------------------------\r
 #  Current version number:\r
 # ----------------------------------------------------------------------------\r
-set(OPENCV_VERSION "2.0.0")\r
+set(OPENCV_VERSION "2.1.0")\r
 \r
 string(REGEX MATCHALL "[0-9]" OPENCV_VERSION_PARTS "${OPENCV_VERSION}")\r
 \r
@@ -78,6 +82,17 @@ else()
 endif()\r
 \r
 \r
+# ----------------------------------------------------------------------------\r
+# Build static or dynamic libs?\r
+# ----------------------------------------------------------------------------\r
+# 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
+ELSE(BUILD_SHARED_LIBS)\r
+    SET(OPENCV_BUILD_SHARED_LIB 0)\r
+ENDIF(BUILD_SHARED_LIBS)\r
+\r
 # ----------------------------------------------------------------------------\r
 #  Variables for cvconfig.h.cmake\r
 # ----------------------------------------------------------------------------\r
@@ -127,9 +142,34 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 \r
     list(GET CMAKE_OPENCV_GCC_VERSIONS 0 CMAKE_OPENCV_GCC_VERSION_MAJOR)\r
     list(GET CMAKE_OPENCV_GCC_VERSIONS 1 CMAKE_OPENCV_GCC_VERSION_MINOR)\r
-\r
+    \r
     set(CMAKE_OPENCV_GCC_VERSION ${CMAKE_OPENCV_GCC_VERSION_MAJOR}${CMAKE_OPENCV_GCC_VERSION_MINOR})\r
-    message(STATUS "Detected version of GNU GCC: ${CMAKE_OPENCV_GCC_VERSION}")\r
+    math(EXPR CMAKE_OPENCV_GCC_VERSION_NUM "${CMAKE_OPENCV_GCC_VERSION_MAJOR}*100 + ${CMAKE_OPENCV_GCC_VERSION_MINOR}")\r
+    message(STATUS "Detected version of GNU GCC: ${CMAKE_OPENCV_GCC_VERSION} (${CMAKE_OPENCV_GCC_VERSION_NUM})")\r
+endif()\r
+\r
+# ----------------------------------------------------------------------------\r
+# Detect Intel ICC compiler -- for -fPIC in 3rdparty ( UNIX ONLY ):\r
+#  see  include/opencv/cxtypes.h file for related   ICC & CV_ICC defines.\r
+# NOTE: The system needs to determine if the '-fPIC' option needs to be added\r
+#  for the 3rdparty static libs being compiled.  The CMakeLists.txt files\r
+#  in 3rdparty use the CV_ICC definition being set here to determine if\r
+#  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
 endif()\r
 \r
 # ----------------------------------------------------------------------------\r
@@ -163,12 +203,12 @@ if(UNIX)
     include(CheckIncludeFile)\r
 endif()\r
 \r
-if(MSVC)\r
-       set(DEFAULT_ENABLE_OPENMP ON)\r
-else()\r
-       set(DEFAULT_ENABLE_OPENMP OFF)\r
-endif()\r
-set(ENABLE_OPENMP ${DEFAULT_ENABLE_OPENMP} CACHE BOOL "")\r
+#if(MSVC)\r
+#   set(DEFAULT_ENABLE_OPENMP ON)\r
+#else()\r
+#   set(DEFAULT_ENABLE_OPENMP OFF)\r
+#endif()\r
+#set(ENABLE_OPENMP ${DEFAULT_ENABLE_OPENMP} CACHE BOOL "")\r
 \r
 if(CMAKE_COMPILER_IS_GNUCXX)\r
     set(ENABLE_PROFILING OFF CACHE BOOL "Enable profiling in the GCC compiler (Add flags: -g -pg)")\r
@@ -178,63 +218,69 @@ if(CMAKE_COMPILER_IS_GNUCXX)
         set(USE_O2 ON CACHE BOOL "Enable -O2 for GCC")\r
         set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math for GCC")\r
     endif()\r
+    \r
     if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*)\r
-        set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC")\r
-        set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math for GCC")\r
-        set(USE_MMX ON CACHE BOOL "Enable MMX for GCC")\r
-        set(USE_SSE ON CACHE BOOL "Enable SSE for GCC")\r
-        set(USE_SSE2 ON CACHE BOOL "Enable SSE2 for GCC")\r
-        set(USE_SSE3 ON CACHE BOOL "Enable SSE3 for GCC")\r
+        set(X86_64 1)\r
     endif()\r
     if(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86_64*)\r
-        set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC")\r
-        set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math for GCC")\r
-        set(USE_MMX ON CACHE BOOL "Enable MMX for GCC")\r
-        set(USE_SSE ON CACHE BOOL "Enable SSE for GCC")\r
-        set(USE_SSE2 ON CACHE BOOL "Enable SSE2 for GCC")\r
-        set(USE_SSE3 ON CACHE BOOL "Enable SSE3 for GCC")\r
+        set(X86_64 1)\r
     endif()\r
+    \r
+    if(${CMAKE_SYSTEM_PROCESSOR} MATCHES i686*)\r
+        set(X86 1)\r
+    endif()\r
+    if(${CMAKE_SYSTEM_PROCESSOR} MATCHES i386*)\r
+        set(X86 1)\r
+    endif()\r
+    if(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86*)\r
+        set(X86 1)\r
+    endif()\r
+        \r
     if(${CMAKE_SYSTEM_PROCESSOR} MATCHES powerpc*)\r
         set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC")\r
-        set(USE_POWERPC ON CACHE BOOL "Enable PowerPC for GCC")\r
+        set(ENABLE_POWERPC ON CACHE BOOL "Enable PowerPC for GCC")\r
     endif ()\r
-    if(${CMAKE_SYSTEM_PROCESSOR} MATCHES i686*)\r
-        set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC")\r
-        set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math for GCC")\r
-        set(USE_MMX ON CACHE BOOL "Enable MMX for GCC")\r
-        set(USE_SSE OFF CACHE BOOL "Enable SSE for GCC")\r
-        set(USE_SSE2 OFF CACHE BOOL "Enable SSE2 for GCC")\r
-        set(USE_SSE3 OFF CACHE BOOL "Enable SSE3 for GCC")\r
-    # SSE/SSE2 might probably be not available for some old AMD or VIA processors\r
-    endif ()\r
-    if(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86)\r
+    \r
+    if(X86 OR X86_64)\r
+        # enable everything, since the available set of instructions is checked at runtime\r
         set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC")\r
         set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math for GCC")\r
-        set(USE_MMX ON CACHE BOOL "Enable MMX for GCC")\r
-        set(USE_SSE OFF CACHE BOOL "Enable SSE for GCC")\r
-        set(USE_SSE2 OFF CACHE BOOL "Enable SSE2 for GCC")\r
-        set(USE_SSE3 OFF CACHE BOOL "Enable SSE3 for GCC")\r
-    # SSE/SSE2 might probably be not available for some old AMD or VIA processors\r
-    endif ()\r
+        set(ENABLE_SSE ON CACHE BOOL "Enable SSE for GCC")\r
+        set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 for GCC")\r
+        set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 for GCC")\r
+        set(ENABLE_SSSE3 OFF CACHE BOOL "Enable SSSE3 for GCC")\r
+        #set(ENABLE_SSE4_1 OFF CACHE BOOL "Enable SSE4.1 for GCC")\r
+    endif()\r
 endif()\r
 \r
 # 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
-    set(WITH_GSTREAMER ON CACHE BOOL "Include Gstreamer 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_V4L ON CACHE BOOL "Include Video 4 Linux support")\r
-    set(WITH_XINE ON CACHE BOOL "Include Xine 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
+endif()\r
+\r
+set(WITH_TBB OFF CACHE BOOL "Include TBB support")\r
+\r
 # ===================================================\r
 # Macros that checks if module have been installed.\r
 # After it adds module to build and define\r
@@ -283,6 +329,7 @@ if(UNIX)
       if(WITH_GSTREAMER)\r
         CHECK_MODULE(gstreamer-base-0.10 HAVE_GSTREAMER)\r
         CHECK_MODULE(gstreamer-app-0.10 HAVE_GSTREAMER_APP)\r
+        CHECK_MODULE(gstreamer-video-0.10 HAVE_GSTREAMER)\r
       else()\r
         set(HAVE_GSTREAMER FALSE)\r
       endif()\r
@@ -297,6 +344,15 @@ if(UNIX)
     else()\r
       set(HAVE_UNICAP FALSE)\r
     endif()\r
+    \r
+    if(WITH_PVAPI)\r
+      find_path(PVAPI_INCLUDE_PATH "PvApi.h"\r
+                PATHS "/usr/include" "/usr/local/include"\r
+                DOC "The path to PvAPI header")\r
+      if(PVAPI_INCLUDE_PATH)\r
+        set(HAVE_PVAPI 1)\r
+      endif()\r
+    endif()\r
 \r
     set(HAVE_FFMPEG 0)\r
     if(WITH_FFMPEG)\r
@@ -316,6 +372,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
@@ -368,7 +430,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
@@ -413,12 +475,118 @@ if(BUILD_SWIG_PYTHON_SUPPORT OR BUILD_NEW_PYTHON_SUPPORT)
         set(PYTHON_PLUGIN_INSTALL_PATH "${PYTHON_PATH}/Lib/site-packages/opencv")\r
         set(PYTHON_PACKAGES_PATH "${PYTHON_PATH}/Lib/site-packages")\r
     endif()\r
+\r
+    # Attempt to discover the NumPy include directory.  If this succeeds, build with NumPy\r
+\r
+    execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import numpy.distutils; print numpy.distutils.misc_util.get_numpy_include_dirs()[0]"\r
+                    RESULT_VARIABLE PYTHON_NUMPY_PROCESS\r
+                    OUTPUT_VARIABLE PYTHON_NUMPY_INCLUDE_DIRS\r
+                    OUTPUT_STRIP_TRAILING_WHITESPACE)\r
+    if(PYTHON_NUMPY_PROCESS EQUAL 0)\r
+      set(PYTHON_USE_NUMPY 1)\r
+      add_definitions(-D PYTHON_USE_NUMPY=1)\r
+      include_directories(AFTER ${PYTHON_NUMPY_INCLUDE_DIRS})\r
+      message(STATUS "    Use INCLUDE: ${PYTHON_NUMPY_INCLUDE_DIRS}")\r
+    else()\r
+      set(PYTHON_USE_NUMPY 0)\r
+    endif()\r
+\r
+\r
 endif()\r
     \r
 if(PYTHONLIBS_FOUND AND BUILD_SWIG_PYTHON_SUPPORT)\r
     find_package(SWIG)\r
 endif()\r
 \r
+############################### TBB ################################\r
+\r
+if (WITH_TBB)\r
+    if (UNIX AND NOT APPLE)\r
+        PKG_CHECK_MODULES(TBB tbb)\r
+        message(STATUS "TBB detected: ${TBBLIB_FOUND}")\r
+            \r
+        if (TBB_FOUND) \r
+            set(HAVE_TBB 1)\r
+            if(NOT "${TBB_INCLUDE_DIRS}" STREQUAL "")\r
+                include_directories("${TBB_INCLUDE_DIRS}")\r
+            endif()\r
+            link_directories("${TBB_LIBRARY_DIRS}")\r
+            set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${TBB_LIBRARIES})\r
+        else()\r
+            set(TBB_DEFAULT_INCLUDE_DIRS\r
+              "/opt/intel/tbb"\r
+              "/usr/local/include"\r
+              "/usr/include")  \r
+        endif()\r
+    endif()        \r
+    if (APPLE)\r
+        set(TBB_DEFAULT_INCLUDE_DIRS\r
+          "/usr/include"\r
+          "/usr/local/include")  \r
+    endif() \r
+    if (WIN32)\r
+        set(TBB_DEFAULT_INCLUDE_DIRS\r
+          "C:/Program Files/Intel/TBB"\r
+          "C:/Program Files (x86)/Intel/TBB")     \r
+    endif()    \r
+    if (NOT HAVE_TBB)\r
+        find_path(TBB_INCLUDE_DIR "tbb/tbb.h"\r
+                  PATHS TBB_DEFAULT_INCLUDE_DIRS\r
+                  DOC "The path to TBB headers")\r
+        if (TBB_INCLUDE_DIR)\r
+            if (UNIX)\r
+                set(TBB_LIB_DIR "${TBB_INCLUDE_DIR}/../lib" CACHE PATH "Full path of TBB library directory")\r
+                link_directories("${TBB_LIB_DIR}")\r
+            endif()\r
+            if (APPLE)\r
+                set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} libtbb.dylib)\r
+            elseif (UNIX)\r
+                set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} tbb)\r
+            elseif (WIN32)\r
+               if (CMAKE_COMPILER_IS_GNUCXX)\r
+                   set(TBB_LIB_DIR "${TBB_INCLUDE_DIR}/../lib" CACHE PATH "Full path of TBB library directory")\r
+                   link_directories("${TBB_LIB_DIR}")\r
+                   set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} tbb)\r
+               else()\r
+                   if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*)\r
+                       set(X86_64 1)\r
+                   endif()\r
+                   if(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86_64*)\r
+                       set(X86_64 1)\r
+                   endif()\r
+                   if(${CMAKE_SYSTEM_PROCESSOR} MATCHES i686*)\r
+                       set(X86 1)\r
+                   endif()\r
+                   if(${CMAKE_SYSTEM_PROCESSOR} MATCHES i386*)\r
+                       set(X86 1)\r
+                   endif()\r
+                   if(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86*)\r
+                       set(X86 1)\r
+                   endif()\r
+                   \r
+                   set(_TBB_LIB_PATH "${TBB_INCLUDE_DIR}/../lib")\r
+                   if (X86_64)\r
+                       set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/intel64")\r
+                   elseif(X86)\r
+                       set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/ia32")\r
+                   endif()\r
+                   if (MSVC80)\r
+                       set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc8")\r
+                   elseif(MSVC90)\r
+                       set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc9")\r
+                   endif()\r
+                   set(TBB_LIB_DIR "${_TBB_LIB_PATH}" CACHE PATH "Full path of TBB library directory")\r
+                   link_directories("${TBB_LIB_DIR}")\r
+               endif()\r
+            endif()\r
+            \r
+            set(HAVE_TBB 1)\r
+            if(NOT "${TBB_INCLUDE_DIR}" STREQUAL "")\r
+                include_directories("${TBB_INCLUDE_DIR}")\r
+            endif()\r
+        endif()\r
+    endif()\r
+endif()\r
 \r
 ############################### IPP ################################\r
 set(IPP_FOUND)\r
@@ -494,7 +662,7 @@ if(IPP_FOUND AND USE_IPP)
                  ${A}ippvmmerged${B} ${A}ippvmemerged${B}\r
                  ${A}ippccmerged${B} ${A}ippccemerged${B}\r
                  ${A}ippcvmerged${B} ${A}ippcvemerged${B}\r
-                 ${A}ippcore${L}${B})\r
+                 ${A}ippcore${IPP_ARCH}${L}${CMAKE_STATIC_LIBRARY_SUFFIX})\r
 endif()\r
 \r
 \r
@@ -533,9 +701,6 @@ include_directories("."
 # Should be set to true for development\r
 set(OPENCV_WARNINGS_ARE_ERRORS OFF CACHE BOOL "Treat warnings as errors")\r
 \r
-# Whole program optimization?\r
-set(OPENCV_WHOLE_PROGRAM_OPTIMIZATION OFF CACHE BOOL "Flags for whole program optimization.")\r
-\r
 set(EXTRA_C_FLAGS "")\r
 set(EXTRA_C_FLAGS_RELEASE "")\r
 set(EXTRA_C_FLAGS_DEBUG "")\r
@@ -549,22 +714,15 @@ if(MSVC)
     if(MSVC80)\r
         set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} /Wp64")\r
     endif()\r
-    if(MSVC90)\r
-    set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} /D _BIND_TO_CURRENT_CRT_VERSION=1 /D _BIND_TO_CURRENT_VCLIBS_VERSION=1")\r
-    endif()\r
+    #if(MSVC90)\r
+    #    set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} /D _BIND_TO_CURRENT_CRT_VERSION=1 /D _BIND_TO_CURRENT_VCLIBS_VERSION=1")\r
+    #endif()\r
 \r
     set(EXTRA_EXE_LINKER_FLAGS_RELEASE "${EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug")\r
 \r
-    # Whole program optimization\r
-    if(OPENCV_WHOLE_PROGRAM_OPTIMIZATION AND MSVC_VERSION GREATER 1300)\r
-        set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} /GL")\r
-        set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG")\r
-        set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /LTCG")\r
-    endif()\r
-\r
-    if(ENABLE_OPENMP)\r
-        set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} /openmp")\r
-    endif()\r
+    #if(ENABLE_OPENMP)\r
+    #    set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} /openmp")\r
+    #endif()\r
 \r
     # Remove unreferenced functions: function level linking\r
     set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} /Gy")\r
@@ -572,6 +730,13 @@ if(MSVC)
 endif()\r
 \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
+\r
     # High level of warnings.\r
     set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Wall")\r
 \r
@@ -592,9 +757,12 @@ if(CMAKE_COMPILER_IS_GNUCXX)
         set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Werror")\r
     endif()\r
 \r
-    # Whole program optimization\r
-    if(OPENCV_WHOLE_PROGRAM_OPTIMIZATION)\r
-        set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -fwhole-program --combine")\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
 \r
     # Other optimizations\r
@@ -610,21 +778,39 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     if(USE_FAST_MATH)\r
        set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -ffast-math")\r
     endif()\r
-    if(USE_POWERPC)\r
+    if(ENABLE_POWERPC)\r
        set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -mcpu=G3 -mtune=G5")\r
     endif()\r
-    if(USE_MMX)\r
-       set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -mmmx")\r
-    endif()\r
-    if(USE_SSE)\r
+    if(ENABLE_SSE)\r
        set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse")\r
     endif()\r
-    if(USE_SSE2)\r
+    if(ENABLE_SSE2)\r
        set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse2")\r
     endif()\r
-    # SSE3 should be disabled under MingW because it generates compiler errors\r
-    if(USE_SSE3 AND NOT MINGW)\r
-       set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse3")\r
+    # SSE3 and further should be disabled under MingW because it generates compiler errors\r
+    if(NOT MINGW)\r
+       if(ENABLE_SSE3)\r
+          set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse3")\r
+       endif()\r
+       if(${CMAKE_OPENCV_GCC_VERSION_NUM} GREATER 402)\r
+          set(HAVE_GCC43_OR_NEWER 1)\r
+       endif()\r
+       if(HAVE_GCC43_OR_NEWER OR APPLE)\r
+          if(ENABLE_SSSE3)\r
+             set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -mssse3")\r
+          endif()\r
+          #if(ENABLE_SSE4_1)\r
+          #   set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse4.1")\r
+          #endif()\r
+       endif()\r
+    endif()\r
+    \r
+    if(X86 OR X86_64)\r
+        if(NOT APPLE)\r
+            if(${CMAKE_SIZEOF_VOID_P} EQUAL 4)\r
+                set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -mfpmath=387")\r
+            endif()\r
+        endif()\r
     endif()\r
 \r
     # Profiling?\r
@@ -638,15 +824,24 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     endif()\r
 \r
     # Parallel mode\r
-    if(ENABLE_OPENMP)\r
-        set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -D_GLIBCXX_PARALLEL -fopenmp")\r
-        set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} gomp)\r
-    endif()\r
+    #if(ENABLE_OPENMP)\r
+    #    set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -D_GLIBCXX_PARALLEL -fopenmp")\r
+    #    set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} gomp)\r
+    #endif()\r
 \r
     set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -DNDEBUG")\r
     set(EXTRA_C_FLAGS_DEBUG "${EXTRA_C_FLAGS_DEBUG} -O0 -DDEBUG -D_DEBUG")\r
 endif()\r
 \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
+\r
+    set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} flann zlib opencv_lapack)\r
+endif()\r
+\r
 \r
 # Add user supplied extra options (optimization, etc...)\r
 # ==========================================================\r
@@ -682,6 +877,14 @@ if (WIN32 AND MSVC)
     string(REPLACE "/W3" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")\r
     string(REPLACE "/W3" "/W4" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")\r
     string(REPLACE "/W3" "/W4" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")\r
+\r
+    # allow extern "C" functions throw exceptions\r
+    string(REPLACE "/EHsc" "/EHsc-" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")\r
+    string(REPLACE "/EHsc" "/EHsc-" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")\r
+    string(REPLACE "/EHsc" "/EHsc-" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")\r
+    string(REPLACE "/EHsc" "/EHsc-" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")\r
+    string(REPLACE "/EHsc" "/EHsc-" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")\r
+    string(REPLACE "/EHsc" "/EHsc-" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")\r
 endif()\r
 \r
 if("${CMAKE_CONFIGURE_LDFLAGS}")\r
@@ -806,9 +1009,9 @@ if(BUILD_PACKAGE)
     \r
     include(${CMAKE_BINARY_DIR}/.cpack/Package.cmake)\r
 \r
-    set(root_files README ChangeLog configure)\r
+    set(root_files README)\r
 \r
-    file(GLOB root_src_files *.in *.sh *.cmake CMakeLists.txt)\r
+    file(GLOB root_src_files *.in *.cmake CMakeLists.txt)\r
 \r
     if (NOT WIN32)\r
         install(FILES ${root_files}\r
@@ -883,6 +1086,7 @@ add_subdirectory(3rdparty)
 message(STATUS "")\r
 message(STATUS "General configuration for opencv ${OPENCV_VERSION} =====================================")\r
 message(STATUS "")\r
+message(STATUS "    Built as dynamic libs?:    ${BUILD_SHARED_LIBS}")\r
 message(STATUS "    Compiler:                  ${CMAKE_COMPILER}")\r
 message(STATUS "    C++ flags (Release):       ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}")\r
 message(STATUS "    C++ flags (Debug):         ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")\r
@@ -894,27 +1098,50 @@ 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
+if(APPLE)\r
+message(STATUS "")\r
+if(HAVE_CARBON)\r
+message(STATUS "  GUI Back-end:                Carbon")\r
+else()\r
+message(STATUS "  GUI Back-end:                Cocoa")\r
+endif()\r
+message(STATUS "")\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 WITH_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
@@ -927,6 +1154,7 @@ message(STATUS "      swscale:                 ${HAVE_FFMPEG_SWSCALE}")
 message(STATUS "      gentoo-style:            ${HAVE_GENTOO_FFMPEG}")\r
 message(STATUS "    GStreamer:                 ${HAVE_GSTREAMER}")\r
 message(STATUS "    UniCap:                    ${HAVE_UNICAP}")\r
+message(STATUS "    PvAPI:                     ${HAVE_PVAPI}")\r
 if(HAVE_LIBV4L)\r
 message(STATUS "    V4L/V4L2:                  Using libv4l")\r
 else()\r
@@ -934,6 +1162,16 @@ message(STATUS "    V4L/V4L2:                  ${HAVE_CAMV4L}/${HAVE_CAMV4L2}")
 endif()\r
 message(STATUS "    Xine:                      ${HAVE_XINE}")\r
 endif()\r
+\r
+if(APPLE)\r
+message(STATUS "")\r
+if(WITH_QUICKTIME)\r
+message(STATUS "  Video I/O:                   QuickTime")\r
+else()\r
+message(STATUS "  Video I/O:                   QTKit")\r
+endif()\r
+endif()\r
+\r
 message(STATUS "")\r
 message(STATUS "  Interfaces: ")\r
 if(PYTHONLIBS_FOUND AND BUILD_SWIG_PYTHON_SUPPORT)\r
@@ -942,11 +1180,21 @@ else()
 message(STATUS "    Old Python:                0")\r
 endif()\r
 message(STATUS "    Python:                    ${BUILD_NEW_PYTHON_SUPPORT}")\r
+message(STATUS "    Python interpreter:        ${PYTHON_EXECUTABLE}")\r
+message(STATUS "    Python numpy:              ${PYTHON_USE_NUMPY}")\r
+\r
 if(IPP_FOUND AND USE_IPP)\r
 message(STATUS "    Use IPP:                   ${IPP_PATH}")\r
 else()\r
 message(STATUS "    Use IPP:                   NO")\r
 endif()\r
+\r
+if(HAVE_TBB)\r
+message(STATUS "    Use TBB:                   YES")\r
+else()\r
+message(STATUS "    Use TBB:                   NO")\r
+endif()\r
+\r
 if(BUILD_LATEX_DOCS AND PDFLATEX_COMPILER)\r
 message(STATUS "    Build Documentation        1")\r
 else()\r