From 5e1a2408fedd379467693b3548d46dad464f72ad Mon Sep 17 00:00:00 2001
From: Clinton Stimpson <clinton@elemtech.com>
Date: Tue, 16 Mar 2010 22:28:03 -0600
Subject: ENH:  Modify how OpenGL is searched for, that is, use
 FindOpenGL.cmake.

---
 Modules/Qt4ConfigDependentSettings.cmake | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/Modules/Qt4ConfigDependentSettings.cmake b/Modules/Qt4ConfigDependentSettings.cmake
index 1c5293d..01f740f 100644
--- a/Modules/Qt4ConfigDependentSettings.cmake
+++ b/Modules/Qt4ConfigDependentSettings.cmake
@@ -60,25 +60,13 @@ IF(WIN32  AND  NOT QT_IS_STATIC)
   SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_DLL)
 ENDIF(WIN32  AND  NOT QT_IS_STATIC)
 
+IF(NOT QT_IS_STATIC)
+  RETURN()
+ENDIF(NOT QT_IS_STATIC)
 
 # QtOpenGL dependencies
-QT_QUERY_QMAKE(QMAKE_LIBS_OPENGL "QMAKE_LIBS_OPENGL")
-IF(Q_WS_MAC)
-# On the Mac OpenGL is probably frameworks and QMAKE_LIBS_OPENGL can be
-# e.g. "-framework OpenGL -framework AGL".  The separate_arguments() call in
-# the other branch makes "-framework;-OpenGL;-framework;-lAGL" appear in the
-# linker command. So we need to protect the "-framework foo" as
-# non-separatable strings.  We do this by replacing the space after
-# "-framework" with an underscore, then calling separate_arguments(), and
-# then we replace the underscores again with spaces. So we get proper linker
-# commands. Alex
-  STRING(REGEX REPLACE "-framework +" "-framework_" QMAKE_LIBS_OPENGL "${QMAKE_LIBS_OPENGL}")
-  SEPARATE_ARGUMENTS(QMAKE_LIBS_OPENGL)
-  STRING(REGEX REPLACE "-framework_" "-framework " QMAKE_LIBS_OPENGL "${QMAKE_LIBS_OPENGL}")
-ELSE(Q_WS_MAC)
-  SEPARATE_ARGUMENTS(QMAKE_LIBS_OPENGL)
-ENDIF(Q_WS_MAC)
-SET (QT_QTOPENGL_LIB_DEPENDENCIES ${QT_QTOPENGL_LIB_DEPENDENCIES} ${QMAKE_LIBS_OPENGL})
+find_package(OpenGL)
+SET (QT_QTOPENGL_LIB_DEPENDENCIES ${OPENGL_glu_LIBRARY} ${OPENGL_gl_LIBRARY})
 
 
 ## system png
-- 
cgit v0.12