Skip to content

O
opencv
Commit 604a64b2 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky Committed by OpenCV Buildbot
Browse files
Options

Merge pull request #2390 from nicolasmartin3d:master_bug3546

parents a0bf7f82 67cf0dab
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
cmake/OpenCVFindLibsGUI.cmake
View file @ 604a64b2
...@@ -69,7 +69,7 @@ endif(WITH_OPENGL) ...@@ -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()
cmake/OpenCVFindLibsVideo.cmake
View file @ 604a64b2
...@@ -273,7 +273,7 @@ endif() ...@@ -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()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment