generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2390 from nicolasmartin3d:master_bug3546

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-04-10 13:33:42 +04:00 committed by OpenCV Buildbot
commit 604a64b206
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVFindLibsGUI.cmake
View File

@ -69,7 +69,7 @@ endif(WITH_OPENGL)
if(APPLE) if(APPLE)
if(WITH_CARBON) if(WITH_CARBON)
set(HAVE_CARBON YES) set(HAVE_CARBON YES)
elseif(NOT IOS) elseif(NOT IOS AND CMAKE_COMPILER_IS_CLANGCXX)
set(HAVE_COCOA YES) set(HAVE_COCOA YES)
endif() endif()
endif() endif()

2
cmake/OpenCVFindLibsVideo.cmake
View File

@ -273,7 +273,7 @@ endif()
if (NOT IOS) if (NOT IOS)
if(WITH_QUICKTIME) if(WITH_QUICKTIME)
set(HAVE_QUICKTIME YES) set(HAVE_QUICKTIME YES)
elseif(APPLE) elseif(APPLE AND CMAKE_COMPILER_IS_CLANGCXX)
set(HAVE_QTKIT YES) set(HAVE_QTKIT YES)
endif() endif()
endif() endif()