Skip to content

Commit

Permalink
Merge pull request opencv#2390 from nicolasmartin3d:master_bug3546
Browse files Browse the repository at this point in the history
  • Loading branch information
vpisarev authored and OpenCV Buildbot committed Apr 10, 2014
2 parents a0bf7f8 + 67cf0da commit 604a64b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cmake/OpenCVFindLibsGUI.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ endif(WITH_OPENGL)
if(APPLE)
if(WITH_CARBON)
set(HAVE_CARBON YES)
elseif(NOT IOS)
elseif(NOT IOS AND CMAKE_COMPILER_IS_CLANGCXX)
set(HAVE_COCOA YES)
endif()
endif()
2 changes: 1 addition & 1 deletion cmake/OpenCVFindLibsVideo.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ endif()
if (NOT IOS)
if(WITH_QUICKTIME)
set(HAVE_QUICKTIME YES)
elseif(APPLE)
elseif(APPLE AND CMAKE_COMPILER_IS_CLANGCXX)
set(HAVE_QTKIT YES)
endif()
endif()
Expand Down

0 comments on commit 604a64b

Please sign in to comment.