From 2aa231cd1153361b27145ce08085b3ca7be68ace Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 8 Oct 2010 18:13:10 +0000 Subject: [PATCH] Disabled the build of Qt examples when building against GLES1 & 2 as Qt GL includes OpenGL headers itself that cause conflict. --- examples/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 5f8d53567..766534c4e 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -185,7 +185,7 @@ IF(DYNAMIC_OPENSCENEGRAPH) ADD_SUBDIRECTORY(osgviewerWX) ENDIF(wxWidgets_FOUND) - IF (QT_FOUND) + IF (QT_FOUND AND NOT OSG_GLES1_AVAILABLE AND NOT OSG_GLES2_AVAILABLE AND NOT OSG_GL3_AVAILABLE) OPTION(BUILD_QT_EXAMPLES "Enable the build of the examples that depend on Qt" ON) IF (BUILD_QT_EXAMPLES AND QT_QTOPENGL_LIBRARY)