[Cmake-commits] CMake branch, master, updated. 5e1a2408fedd379467693b3548d46dad464f72ad

[cmake-commits at cmake.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  5e1a2408fedd379467693b3548d46dad464f72ad (commit)
      from  7f98d73457f6d5314a59759830a3d44df59aa669 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5e1a2408fedd379467693b3548d46dad464f72ad
commit 5e1a2408fedd379467693b3548d46dad464f72ad
Author: Clinton Stimpson <clinton at elemtech.com>
Date:   Tue Mar 16 22:28:03 2010 -0600

    ENH:  Modify how OpenGL is searched for, that is, use FindOpenGL.cmake.

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

-----------------------------------------------------------------------

Summary of changes:
 Modules/Qt4ConfigDependentSettings.cmake |   22 +++++-----------------
 1 files changed, 5 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
CMake