Skip to content

Commit 604a64b

Browse files
vpisarevOpenCV Buildbot
authored and
OpenCV Buildbot
committed
Merge pull request opencv#2390 from nicolasmartin3d:master_bug3546
2 parents a0bf7f8 + 67cf0da commit 604a64b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

cmake/OpenCVFindLibsGUI.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ endif(WITH_OPENGL)
6969
if(APPLE)
7070
if(WITH_CARBON)
7171
set(HAVE_CARBON YES)
72-
elseif(NOT IOS)
72+
elseif(NOT IOS AND CMAKE_COMPILER_IS_CLANGCXX)
7373
set(HAVE_COCOA YES)
7474
endif()
7575
endif()

cmake/OpenCVFindLibsVideo.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ endif()
273273
if (NOT IOS)
274274
if(WITH_QUICKTIME)
275275
set(HAVE_QUICKTIME YES)
276-
elseif(APPLE)
276+
elseif(APPLE AND CMAKE_COMPILER_IS_CLANGCXX)
277277
set(HAVE_QTKIT YES)
278278
endif()
279279
endif()

0 commit comments

Comments
 (0)