[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.99 1.100

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv16424

Modified Files:
	FindQt4.cmake 
Log Message:

ENH:  Satisfy QtNetwork and QtOpenGL dependencies for builds with static Qt.
      Partial fix for #6607.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.99
retrieving revision 1.100
diff -C 2 -d -r1.99 -r1.100
*** FindQt4.cmake	14 Mar 2008 17:16:58 -0000	1.99
--- FindQt4.cmake	14 Mar 2008 17:29:16 -0000	1.100
***************
*** 1270,1273 ****
--- 1270,1275 ----
    SET(QT_QTGUI_LIB_DEPENDENCIES "")
    SET(QT_QTCORE_LIB_DEPENDENCIES "")
+   SET(QT_QTNETWORK_LIB_DEPENDENCIES "")
+   SET(QT_QTOPENGL_LIB_DEPENDENCIES "")
    SET(QT_QTHELP_LIB_DEPENDENCIES ${QT_QTCLUCENE_LIBRARY})
    
***************
*** 1279,1282 ****
--- 1281,1288 ----
    ENDIF(NOT QT_CONFIG MATCHES "static")
    
+   # QtOpenGL dependencies
+   QT_QUERY_QMAKE(QMAKE_LIBS_OPENGL "QMAKE_LIBS_OPENGL")
+   SET (QT_QTOPENGL_LIB_DEPENDENCIES ${QT_QTOPENGL_LIB_DEPENDENCIES} ${QMAKE_LIBS_OPENGL})
+   
    ## system png
    IF(QT_QCONFIG MATCHES "system-png")
***************
*** 1363,1366 ****
--- 1369,1378 ----
      MARK_AS_ADVANCED(QT_ZLIB_LIBRARY)
    ENDIF(QT_QCONFIG MATCHES "system-zlib")
+ 
+   ## openssl
+   IF(QT_QCONFIG MATCHES "openssl")
+     FIND_PACKAGE(OpenSSL)
+     SET(QT_QTNETWORK_LIB_DEPENDENCIES ${QT_QTNETWORK_LIB_DEPENDENCIES} ${OPENSSL_LIBRARIES})
+   ENDIF(QT_QCONFIG MATCHES "openssl")
    
    ## glib
***************
*** 1406,1410 ****
      ENDIF(QT_POSIX_TIMERS)
    ENDIF(QT_QCONFIG MATCHES "clock-monotonic")
!  
    IF(Q_WS_X11)
      # X11 libraries Qt absolutely depends on
--- 1418,1422 ----
      ENDIF(QT_POSIX_TIMERS)
    ENDIF(QT_QCONFIG MATCHES "clock-monotonic")
!     
    IF(Q_WS_X11)
      # X11 libraries Qt absolutely depends on