X-Git-Url: https://rtime.felk.cvut.cz/gitweb/opencv.git/blobdiff_plain/70a93f70b73d4ff0b4124f6f8aca834445441caf..15d85f441d93a18cdb4a50a811ef98e09f04008b:/opencv/src/highgui/CMakeLists.txt

diff --git a/opencv/src/highgui/CMakeLists.txt b/opencv/src/highgui/CMakeLists.txt
index f4b64c02..19b93e40 100644
--- a/opencv/src/highgui/CMakeLists.txt
+++ b/opencv/src/highgui/CMakeLists.txt
@@ -118,7 +118,9 @@ if(UNIX)
 	if(HAVE_LIBV4L)
 		set(highgui_srcs ${highgui_srcs} cvcap_libv4l.cpp)
 	else()
-		set(highgui_srcs ${highgui_srcs} cvcap_v4l.cpp)
+		if(HAVE_CAMV4L OR HAVE_CAMV4L2)
+			set(highgui_srcs ${highgui_srcs} cvcap_v4l.cpp)
+		endif()
 	endif()
 
 	if(JPEG_FOUND)
@@ -149,7 +151,6 @@ if(APPLE)
     if(NOT OPENCV_BUILD_3RDPARTY_LIBS)
         add_definitions(-DHAVE_IMAGEIO=1)
     endif()
-    set(highgui_srcs ${highgui_srcs} cvcap_qt.mm)
     if(WITH_CARBON)
         add_definitions(-DHAVE_CARBON=1)
         set(highgui_srcs ${highgui_srcs} window_carbon.cpp)
@@ -157,6 +158,11 @@ if(APPLE)
         add_definitions(-DHAVE_COCOA=1)
         set(highgui_srcs ${highgui_srcs} window_cocoa.mm)
     endif()
+	if(WITH_QUICKTIME)
+		set(highgui_srcs ${highgui_srcs} cvcap_qt.cpp)
+	else()
+		set(highgui_srcs ${highgui_srcs} cvcap_qt.mm)
+	endif()
 endif(APPLE)
 
 source_group("Src" FILES ${highgui_srcs} ${highgui_hdrs})
@@ -265,9 +271,12 @@ if(WIN32)
 endif()
 
 if(APPLE)
-	target_link_libraries(${the_target} "-framework QTKit -lbz2 -framework Cocoa -framework CoreFoundation -framework QuartzCore")
+	target_link_libraries(${the_target} "-lbz2 -framework Cocoa -framework QuickTime -framework CoreFoundation -framework QuartzCore")
 	if(WITH_CARBON)
-		target_link_libraries(${the_target} "-framework Carbon -framework QuickTime")
+		target_link_libraries(${the_target} "-framework Carbon")
+	endif()
+	if(NOT WITH_QUICKTIME)
+		target_link_libraries(${the_target} "-framework QTKit")
 	endif()
 endif()