Merge pull request #9439 from eruffaldi:macos_build_opengl_qt5_interop2

b67c64e2 · Alexander Alekhin · a710317a · 301ab438 · b67c64e2
Commit b67c64e2 authored Aug 23, 2017 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

CMakeLists.txt samples/opengl/CMakeLists.txt +6 -0

No files found.
--- a/samples/opengl/CMakeLists.txt
+++ b/samples/opengl/CMakeLists.txt
+if(APPLE)
+    return()
+endif()
+
 if(UNIX)
  find_package(X11 QUIET)
  if(NOT X11_FOUND)
@@ -8,6 +12,8 @@ if(UNIX)
  set(SAMPLE_LINKER_DEPS "${X11_LIBRARIES}")
 endif()

+
+
 SET(OPENCV_OPENGL_SAMPLES_REQUIRED_DEPS opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui)

 ocv_check_dependencies(${OPENCV_OPENGL_SAMPLES_REQUIRED_DEPS})