From 091c7a38217a6fe84280805fba65f90f795be528 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Tue, 30 Dec 2014 16:45:46 +0300
Subject: [PATCH] OpenGL interop sample reworked not ot use cvconfig.h

---
 samples/gpu/CMakeLists.txt | 7 +++++++
 samples/gpu/opengl.cpp     | 9 ---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/samples/gpu/CMakeLists.txt b/samples/gpu/CMakeLists.txt
index 17d114b33b..56aaf0c587 100644
--- a/samples/gpu/CMakeLists.txt
+++ b/samples/gpu/CMakeLists.txt
@@ -71,6 +71,10 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
 
   file(GLOB all_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
 
+  if(NOT WITH_OPENGL)
+    list(REMOVE_ITEM all_samples "opengl.cpp")
+  endif(NOT WITH_OPENGL)
+
   foreach(sample_filename ${all_samples})
     get_filename_component(sample ${sample_filename} NAME_WE)
     file(GLOB sample_srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${sample}.*)
@@ -82,6 +86,9 @@ endif()
 
 if (OCV_DEPENDENCIES_FOUND AND INSTALL_C_EXAMPLES AND NOT WIN32)
   file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+  if(NOT WITH_OPENGL)
+    list(REMOVE_ITEM all_samples "opengl.cpp")
+  endif(NOT WITH_OPENGL)
   install(FILES ${install_list}
           DESTINATION ${OPENCV_SAMPLES_SRC_INSTALL_PATH}/gpu
           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ COMPONENT samples)
diff --git a/samples/gpu/opengl.cpp b/samples/gpu/opengl.cpp
index 5b84a5bef5..d90a6658ec 100644
--- a/samples/gpu/opengl.cpp
+++ b/samples/gpu/opengl.cpp
@@ -1,13 +1,4 @@
 #include <iostream>
-#include "cvconfig.h"
-
-#ifndef HAVE_OPENGL
-int main()
-{
-    std::cerr << "Library was built without OpenGL support" << std::endl;
-    return -1;
-}
-#else
 
 #ifdef WIN32
     #define WIN32_LEAN_AND_MEAN 1