[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.103 1.104

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:

ENH:  Satisfy QtDBus dependencies for builds with static Qt.
      Finish fix for #6607.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.103
retrieving revision 1.104
diff -C 2 -d -r1.103 -r1.104
*** FindQt4.cmake	17 Mar 2008 18:53:02 -0000	1.103
--- FindQt4.cmake	18 Mar 2008 20:30:14 -0000	1.104
***************
*** 1272,1275 ****
--- 1272,1276 ----
    SET(QT_QTNETWORK_LIB_DEPENDENCIES "")
    SET(QT_QTOPENGL_LIB_DEPENDENCIES "")
+   SET(QT_QTDBUS_LIB_DEPENDENCIES "")
    SET(QT_QTHELP_LIB_DEPENDENCIES ${QT_QTCLUCENE_LIBRARY})
    
***************
*** 1371,1378 ****
  
    ## 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
--- 1372,1407 ----
  
    ## openssl
!   IF(QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN)
      FIND_PACKAGE(OpenSSL)
      SET(QT_QTNETWORK_LIB_DEPENDENCIES ${QT_QTNETWORK_LIB_DEPENDENCIES} ${OPENSSL_LIBRARIES})
!   ENDIF(QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN)
!   
!   ## qdbus
!   IF(QT_QCONFIG MATCHES "qdbus")
! 
!     EXECUTE_PROCESS(COMMAND pkg-config --libs-only-L dbus-1
!       OUTPUT_VARIABLE _dbus_query_output
!       RESULT_VARIABLE _dbus_result
!       ERROR_VARIABLE _dbus_query_output )
!     
!     IF(_dbus_result MATCHES 0)
!       STRING(REPLACE "-L" "" _dbus_query_output "${_dbus_query_output}")
!       SEPARATE_ARGUMENTS(_dbus_query_output)
!     ELSE(_dbus_result MATCHES 0)
!       SET(_dbus_query_output)
!       MESSAGE(WARNING " When querying pkg-config for dbus-1.  An error was reported:\n${_dbus_query_output}")
!     ENDIF(_dbus_result MATCHES 0)
! 
!     FIND_LIBRARY(QT_DBUS_LIBRARY NAMES dbus-1 PATHS ${_dbus_query_output} )
! 
!     IF(NOT QT_DBUS_LIBRARY)
!       MESSAGE(WARNING " Unable to find dbus-1 to satisfy Qt dependency.")
!     ELSE(NOT QT_DBUS_LIBRARY)
!       SET(QT_QTDBUS_LIB_DEPENDENCIES ${QT_QTDBUS_LIB_DEPENDENCIES} ${QT_DBUS_LIBRARY})
!     ENDIF(NOT QT_DBUS_LIBRARY)
! 
!     MARK_AS_ADVANCED(QT_DBUS_LIBRARY)
! 
!   ENDIF(QT_QCONFIG MATCHES "qdbus")
    
    ## glib
***************
*** 1389,1393 ****
      ELSE(_glib_result MATCHES 0)
        SET(_glib_query_output)
!       MESSAGE(WARNING "When querying pkg-config for glib-2.0.  An error was reported:\n${_glib_query_output}")
      ENDIF(_glib_result MATCHES 0)
  
--- 1418,1422 ----
      ELSE(_glib_result MATCHES 0)
        SET(_glib_query_output)
!       MESSAGE(WARNING " When querying pkg-config for glib-2.0.  An error was reported:\n${_glib_query_output}")
      ENDIF(_glib_result MATCHES 0)
  
***************
*** 1396,1400 ****
  
      IF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
!       MESSAGE(WARNING "Unable to find glib 2.0 to satisfy Qt dependency.")
      ELSE(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
        SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES}
--- 1425,1429 ----
  
      IF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
!       MESSAGE(WARNING " Unable to find glib 2.0 to satisfy Qt dependency.")
      ELSE(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
        SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES}