use FindZLIB(), FindJPEG() etc. on MacOSX as well to avoid possible conflicts with...
authorVadim Pisarevsky <no@email>
Fri, 27 May 2011 13:47:18 +0000 (13:47 +0000)
committerVadim Pisarevsky <no@email>
Fri, 27 May 2011 13:47:18 +0000 (13:47 +0000)
CMakeLists.txt
modules/highgui/CMakeLists.txt

index 022a4e8..05fe10b 100644 (file)
@@ -215,7 +215,7 @@ set(BUILD_TESTS ON CACHE BOOL "Build tests")
 \r
 # Build 3rdparty libraries under unix\r
 # ===================================================\r
-if(WIN32 OR APPLE)\r
+if(WIN32)\r
     set(OPENCV_BUILD_3RDPARTY_LIBS TRUE  CACHE BOOL "Build 3rd party libraries")\r
 else()\r
     set(OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL "Build 3rd party libraries")\r
@@ -425,6 +425,34 @@ if(UNIX)
       set(HAVE_DC1394 FALSE)\r
     endif()\r
 \r
+    if(NOT OPENCV_BUILD_3RDPARTY_LIBS)\r
+        include(FindZLIB)\r
+        if(WITH_PNG)\r
+            include(FindPNG)\r
+            if(PNG_FOUND)\r
+                CHECK_INCLUDE_FILE(${PNG_PNG_INCLUDE_DIR}/png.h HAVE_PNG_H)\r
+                CHECK_INCLUDE_FILE(${PNG_PNG_INCLUDE_DIR}/libpng/png.h HAVE_LIBPNG_PNG_H)\r
+            endif()\r
+        else()\r
+            set(PNG_FOUND FALSE)\r
+        endif()\r
+        if(WITH_TIFF)\r
+            include(FindTIFF)\r
+        else()\r
+            set(TIFF_FOUND FALSE)\r
+        endif()\r
+        if(WITH_JASPER)\r
+            include(FindJasper)\r
+        else()\r
+            set(JASPER_FOUND FALSE)\r
+        endif()\r
+        if(WITH_JPEG)\r
+            include(FindJPEG)\r
+        else()\r
+            set(JPEG_FOUND FALSE)\r
+        endif()\r
+    endif()\r
+\r
     if(NOT APPLE)\r
         CHECK_INCLUDE_FILE(alloca.h HAVE_ALLOCA_H)\r
         CHECK_FUNCTION_EXISTS(alloca HAVE_ALLOCA)\r
@@ -437,8 +465,6 @@ if(UNIX)
             set(HAVE_XINE FALSE)\r
         endif()\r
         if(WITH_V4L)\r
-\r
-\r
             CHECK_MODULE(libv4l1 HAVE_LIBV4L)\r
             CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)\r
             CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2)\r
@@ -448,34 +474,6 @@ if(UNIX)
             set(HAVE_CAMV4L2 FALSE)\r
         endif()\r
 \r
-        if(NOT OPENCV_BUILD_3RDPARTY_LIBS)\r
-            include(FindZLIB)\r
-            if(WITH_PNG)\r
-                include(FindPNG)\r
-                if(PNG_FOUND)\r
-                    CHECK_INCLUDE_FILE(${PNG_PNG_INCLUDE_DIR}/png.h HAVE_PNG_H)\r
-                    CHECK_INCLUDE_FILE(${PNG_PNG_INCLUDE_DIR}/libpng/png.h HAVE_LIBPNG_PNG_H)\r
-                endif()\r
-            else()\r
-                set(PNG_FOUND FALSE)\r
-            endif()\r
-            if(WITH_TIFF)\r
-                include(FindTIFF)\r
-            else()\r
-                set(TIFF_FOUND FALSE)\r
-            endif()\r
-            if(WITH_JASPER)\r
-                include(FindJasper)\r
-            else()\r
-                set(JASPER_FOUND FALSE)\r
-            endif()\r
-            if(WITH_JPEG)\r
-                include(FindJPEG)\r
-            else()\r
-                set(JPEG_FOUND FALSE)\r
-            endif()\r
-        endif()\r
-\r
         if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" AND NOT ANDROID)\r
             set(OPENCV_LINKER_LIBS m pthread)\r
         elseif(ANDROID)\r
@@ -603,12 +601,12 @@ if (WITH_QT)
 \r
     #if (NOT WIN32)\r
     if (WITH_QT_OPENGL)\r
-               if (QT_QTOPENGL_FOUND AND OPENGL_FOUND)\r
-                       set(HAVE_QT_OPENGL 1)\r
-                       add_definitions(-DHAVE_QT_OPENGL)\r
-                       #link_directories("${OPENGL_LIBRARIES}")\r
-                       set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${OPENGL_LIBRARIES})\r
-               endif()\r
+        if (QT_QTOPENGL_FOUND AND OPENGL_FOUND)\r
+            set(HAVE_QT_OPENGL 1)\r
+            add_definitions(-DHAVE_QT_OPENGL)\r
+            #link_directories("${OPENGL_LIBRARIES}")\r
+            set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${OPENGL_LIBRARIES})\r
+        endif()\r
     endif()\r
     #endif()\r
 \r
@@ -633,9 +631,9 @@ if (WITH_TBB)
     endif()    \r
     \r
     if (NOT HAVE_TBB)\r
-               set(TBB_DEFAULT_INCLUDE_DIRS "/opt/intel/tbb" "/usr/local/include" "/usr/include" "C:/Program Files/Intel/TBB" "C:/Program Files (x86)/Intel/TBB")\r
-               \r
-               find_path(TBB_INCLUDE_DIR "tbb/tbb.h" PATHS ${TBB_DEFAULT_INCLUDE_DIRS} DOC "The path to TBB headers")\r
+        set(TBB_DEFAULT_INCLUDE_DIRS "/opt/intel/tbb" "/usr/local/include" "/usr/include" "C:/Program Files/Intel/TBB" "C:/Program Files (x86)/Intel/TBB")\r
+        \r
+        find_path(TBB_INCLUDE_DIR "tbb/tbb.h" PATHS ${TBB_DEFAULT_INCLUDE_DIRS} 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
@@ -646,47 +644,47 @@ if (WITH_TBB)
             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
-                                   get_filename_component(_TBB_LIB_PATH "${TBB_INCLUDE_DIR}/../lib" ABSOLUTE)                          \r
-                                  \r
-                                       if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*|x86_64*)\r
-                                               set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/intel64")\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
+                    get_filename_component(_TBB_LIB_PATH "${TBB_INCLUDE_DIR}/../lib" ABSOLUTE)                          \r
+                   \r
+                    if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*|x86_64*)\r
+                        set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/intel64")\r
                     endif()                   \r
                     if(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86*|i386*|i686*)\r
-                                               set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/ia32")\r
-                                       endif()\r
-\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
-                                       elseif(MSVC10)\r
-                                               set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc10")\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
+                        set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/ia32")\r
+                    endif()\r
+\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
+                    elseif(MSVC10)\r
+                        set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/vc10")\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(WITH_TBB)\r
 \r
 #Threading Framework -- temporary decision for ARM-s instead of TBB\r
 if (NOT HAVE_TBB)\r
-       file(GLOB THREADING_FRAMEWORK_HEADER "${CMAKE_SOURCE_DIR}/modules/core/include/opencv2/core/threading_framework.hpp")\r
-       file(GLOB THREADING_FRAMEWORK_SOURCE "${CMAKE_SOURCE_DIR}/modules/core/src/threading_framework.cpp")\r
-       if(THREADING_FRAMEWORK_HEADER AND THREADING_FRAMEWORK_SOURCE)\r
-               set(HAVE_THREADING_FRAMEWORK 1)\r
-       endif()\r
+    file(GLOB THREADING_FRAMEWORK_HEADER "${CMAKE_SOURCE_DIR}/modules/core/include/opencv2/core/threading_framework.hpp")\r
+    file(GLOB THREADING_FRAMEWORK_SOURCE "${CMAKE_SOURCE_DIR}/modules/core/src/threading_framework.cpp")\r
+    if(THREADING_FRAMEWORK_HEADER AND THREADING_FRAMEWORK_SOURCE)\r
+        set(HAVE_THREADING_FRAMEWORK 1)\r
+    endif()\r
 endif()\r
 \r
 ############################ Intel IPP #############################\r
@@ -770,12 +768,12 @@ endif()
 ############################### VideoInput ################################\r
 \r
 if (WIN32 AND WITH_VIDEOINPUT)\r
-       if(CMAKE_CXX_COMPILER MATCHES "dw2")\r
-       else()\r
-               if(NOT MINGW64)\r
-                       set(HAVE_VIDEOINPUT 1)\r
-               endif()\r
-       endif()\r
+    if(CMAKE_CXX_COMPILER MATCHES "dw2")\r
+    else()\r
+        if(NOT MINGW64)\r
+            set(HAVE_VIDEOINPUT 1)\r
+        endif()\r
+    endif()\r
 endif()\r
 \r
 ############################### OpenNI ################################\r
@@ -1111,13 +1109,13 @@ set(CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE "\"${CMAKE_CURRENT_SOURCE_DIR}\"")
 set(CMAKE_LIB_DIRS_CONFIGCMAKE "${LIBRARY_OUTPUT_PATH}")\r
 \r
 if (ANDROID)\r
-       if (NOT BUILD_SHARED_LIBS)\r
-         set(CMAKE_LIB_DIRS_CONFIGCMAKE ${CMAKE_LIB_DIRS_CONFIGCMAKE} "${CMAKE_BINARY_DIR}/lib")\r
-       endif()\r
+    if (NOT BUILD_SHARED_LIBS)\r
+      set(CMAKE_LIB_DIRS_CONFIGCMAKE ${CMAKE_LIB_DIRS_CONFIGCMAKE} "${CMAKE_BINARY_DIR}/lib")\r
+    endif()\r
 \r
-       if( HAVE_ANDROID_NATIVE_CAMERA )\r
-         set(CMAKE_LIB_DIRS_CONFIGCMAKE ${CMAKE_LIB_DIRS_CONFIGCMAKE} ${NativeCamera_LIB_DIR})\r
-       endif()\r
+    if( HAVE_ANDROID_NATIVE_CAMERA )\r
+      set(CMAKE_LIB_DIRS_CONFIGCMAKE ${CMAKE_LIB_DIRS_CONFIGCMAKE} ${NativeCamera_LIB_DIR})\r
+    endif()\r
 endif()\r
 \r
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/OpenCVConfig.cmake" IMMEDIATE @ONLY)\r
@@ -1278,7 +1276,7 @@ endif()
 #-----------------------------------\r
 \r
 if(${CMAKE_VERSION} VERSION_GREATER "2.8.0")\r
-       set(ENABLE_SOLUTION_FOLDERS OFF CACHE BOOL "Solution folder in Visual Studio or in other IDEs")\r
+    set(ENABLE_SOLUTION_FOLDERS OFF CACHE BOOL "Solution folder in Visual Studio or in other IDEs")\r
 endif()\r
 \r
 if(ENABLE_SOLUTION_FOLDERS)\r
index 05eab65..597c1ea 100644 (file)
@@ -18,53 +18,53 @@ if(WITH_PNG OR WITH_TIFF OR WITH_OPENEXR)
 endif()
 
 if(WITH_JPEG)
-       add_definitions(-DHAVE_JPEG)
-       if(JPEG_FOUND)
+    add_definitions(-DHAVE_JPEG)
+    if(JPEG_FOUND)
         include_directories(${JPEG_INCLUDE_DIR})
         set(GRFMT_LIBS ${GRFMT_LIBS} ${JPEG_LIBRARIES})
     else()
         include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/libjpeg")
         set(GRFMT_LIBS ${GRFMT_LIBS} libjpeg)
-       endif()
+    endif()
 endif()
 
 if(WITH_PNG)
-       add_definitions(-DHAVE_PNG)
-       if(PNG_FOUND)
+    add_definitions(-DHAVE_PNG)
+    if(PNG_FOUND)
         add_definitions(${PNG_DEFINITIONS})
         include_directories(${PNG_INCLUDE_DIR})
         set(GRFMT_LIBS ${GRFMT_LIBS} ${PNG_LIBRARIES})
     else()
         include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/libpng")
         set(GRFMT_LIBS ${GRFMT_LIBS} libpng)
-       endif()
+    endif()
 endif()
 
 if(WITH_TIFF)
-       add_definitions(-DHAVE_TIFF)
-       if(TIFF_FOUND)
+    add_definitions(-DHAVE_TIFF)
+    if(TIFF_FOUND)
         include_directories(${TIFF_INCLUDE_DIR})
         set(GRFMT_LIBS ${GRFMT_LIBS} ${TIFF_LIBRARIES})
     else()
         include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/libtiff")
         set(GRFMT_LIBS ${GRFMT_LIBS} libtiff)
-       endif()
+    endif()
 endif()
 
 if(WITH_JASPER)
-       add_definitions(-DHAVE_JASPER)
-       if(JPEG_FOUND)
+    add_definitions(-DHAVE_JASPER)
+    if(JASPER_FOUND)
         include_directories(${JASPER_INCLUDE_DIR})
         set(GRFMT_LIBS ${GRFMT_LIBS} ${JASPER_LIBRARIES})
     else()
         include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/libjasper")
         set(GRFMT_LIBS ${GRFMT_LIBS} libjasper)
-       endif()
+    endif()
 endif()
 
 if(WITH_OPENEXR AND OPENEXR_FOUND)
-       add_definitions(-DHAVE_OPENEXR)
-       include_directories(${OPENEXR_INCLUDE_PATHS})
+    add_definitions(-DHAVE_OPENEXR)
+    include_directories(${OPENEXR_INCLUDE_PATHS})
     set(GRFMT_LIBS ${GRFMT_LIBS} ${OPENEXR_LIBRARIES})
 endif()
 
@@ -105,7 +105,7 @@ if (HAVE_QT)
     INCLUDE(${QT_USE_FILE})
     
     SET(_RCCS_FILES src/window_QT.qrc)
-       QT4_ADD_RESOURCES(_RCC_OUTFILES ${_RCCS_FILES})
+    QT4_ADD_RESOURCES(_RCC_OUTFILES ${_RCCS_FILES})
 
     SET(_MOC_HEADERS src/window_QT.h )
     QT4_WRAP_CPP(_MOC_OUTFILES ${_MOC_HEADERS})
@@ -126,9 +126,9 @@ endif()
 
 if(UNIX)
     if(NOT HAVE_QT)        
-       if(HAVE_GTK)
+        if(HAVE_GTK)
             set(highgui_srcs ${highgui_srcs} src/window_gtk.cpp)
-       endif()
+        endif()
     endif()
 
     if(HAVE_XINE)
@@ -164,13 +164,13 @@ if(UNIX)
         set(highgui_srcs ${highgui_srcs} src/cap_unicap.cpp)
     endif()
 
-       if(HAVE_LIBV4L)
-               set(highgui_srcs ${highgui_srcs} src/cap_libv4l.cpp)
-       else()
-               if(HAVE_CAMV4L OR HAVE_CAMV4L2)
-                       set(highgui_srcs ${highgui_srcs} src/cap_v4l.cpp)
-               endif()
-       endif()
+    if(HAVE_LIBV4L)
+        set(highgui_srcs ${highgui_srcs} src/cap_libv4l.cpp)
+    else()
+        if(HAVE_CAMV4L OR HAVE_CAMV4L2)
+            set(highgui_srcs ${highgui_srcs} src/cap_v4l.cpp)
+        endif()
+    endif()
 
     foreach(P ${HIGHGUI_INCLUDE_DIRS})
         include_directories(${P})
@@ -204,11 +204,11 @@ if(APPLE)
         endif()
     endif()
     
-       if(WITH_QUICKTIME)
-               set(highgui_srcs ${highgui_srcs} src/cap_qt.cpp)
-       else()
-               set(highgui_srcs ${highgui_srcs} src/cap_qtkit.mm)
-       endif()
+    if(WITH_QUICKTIME)
+        set(highgui_srcs ${highgui_srcs} src/cap_qt.cpp)
+    else()
+        set(highgui_srcs ${highgui_srcs} src/cap_qtkit.mm)
+    endif()
 endif(APPLE)
 
 if(HAVE_ANDROID_NATIVE_CAMERA)
@@ -240,7 +240,7 @@ endif()
 set(lib_srcs ${highgui_srcs} ${grfmt_srcs})
 
 # ----------------------------------------------------------------------------------
-#                              Define the library target:
+#               Define the library target:
 # ----------------------------------------------------------------------------------
 set(the_target "opencv_highgui")
 
@@ -249,8 +249,8 @@ if (OPENCV_BUILD_SHARED_LIB)
 endif()
 
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include"
-                                       "${CMAKE_CURRENT_SOURCE_DIR}/../core/include"
-                                       "${CMAKE_CURRENT_SOURCE_DIR}/../imgproc/include"
+                    "${CMAKE_CURRENT_SOURCE_DIR}/../core/include"
+                    "${CMAKE_CURRENT_SOURCE_DIR}/../imgproc/include"
                     "${CMAKE_CURRENT_SOURCE_DIR}/src"
                     "${CMAKE_CURRENT_BINARY_DIR}")
 
@@ -281,20 +281,20 @@ set_target_properties(${the_target} PROPERTIES
 
 # Additional target properties
 set_target_properties(${the_target} PROPERTIES
-       DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
-       ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
-       RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
-       INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
-       LINK_INTERFACE_LIBRARIES ""
-       )
+    DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
+    INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
+    LINK_INTERFACE_LIBRARIES ""
+    )
 
 if(ENABLE_SOLUTION_FOLDERS)
-       set_target_properties(${the_target} PROPERTIES FOLDER "modules")
-endif()        
+    set_target_properties(${the_target} PROPERTIES FOLDER "modules")
+endif() 
 
 
 if(MSVC)
-       set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG")
+    set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG")
 endif(MSVC)
 
 # Dependencies of this target:
@@ -303,19 +303,19 @@ add_dependencies(${the_target} opencv_core opencv_imgproc)
 # Add the required libraries for linking:
 
 if(WITH_JASPER AND NOT JASPER_FOUND)
-       add_dependencies(${the_target} libjasper)
+    add_dependencies(${the_target} libjasper)
 endif()
 
 if(WITH_JPEG AND NOT JPEG_FOUND)
-       add_dependencies(${the_target} libjpeg)
+    add_dependencies(${the_target} libjpeg)
 endif()
 
 if(WITH_PNG AND NOT PNG_FOUND)
-       add_dependencies(${the_target} libpng)
+    add_dependencies(${the_target} libpng)
 endif()
 
 if(WITH_TIFF AND NOT TIFF_FOUND)
-       add_dependencies(${the_target} libtiff)
+    add_dependencies(${the_target} libtiff)
 endif()
 
 if(NOT ZLIB_FOUND)
@@ -333,22 +333,22 @@ if( OPENNI_LIBRARY )
 endif()
 
 if(APPLE)
-       target_link_libraries(${the_target} "-lbz2 -framework Cocoa -framework QuartzCore")
-       if(WITH_CARBON)
-               target_link_libraries(${the_target} "-framework Carbon")
-       endif()
-       if(NOT WITH_QUICKTIME)
-               target_link_libraries(${the_target} "-framework QTKit")
+    target_link_libraries(${the_target} "-lbz2 -framework Cocoa -framework QuartzCore")
+    if(WITH_CARBON)
+        target_link_libraries(${the_target} "-framework Carbon")
+    endif()
+    if(NOT WITH_QUICKTIME)
+        target_link_libraries(${the_target} "-framework QTKit")
     endif()
-       if(WITH_CARBON OR WITH_QUICKTIME)
+    if(WITH_CARBON OR WITH_QUICKTIME)
         target_link_libraries(${the_target} "-framework QuickTime -framework CoreFoundation")
-       endif()
+    endif()
 endif()
 
 install(TARGETS ${the_target}
-       RUNTIME DESTINATION bin COMPONENT main
-       LIBRARY DESTINATION lib COMPONENT main
-       ARCHIVE DESTINATION lib COMPONENT main)
+    RUNTIME DESTINATION bin COMPONENT main
+    LIBRARY DESTINATION lib COMPONENT main
+    ARCHIVE DESTINATION lib COMPONENT main)
 
 install(FILES ${highgui_ext_hdrs}
         DESTINATION include/opencv2/highgui