[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.108 1.109

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:

BUG:  Fix issue when Qt from Linux distro is used 
      and glib and dbus development packages aren't installed.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.108
retrieving revision 1.109
diff -C 2 -d -r1.108 -r1.109
*** FindQt4.cmake	19 Mar 2008 19:27:09 -0000	1.108
--- FindQt4.cmake	19 Mar 2008 20:14:06 -0000	1.109
***************
*** 1404,1429 ****
    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)
!       MESSAGE(WARNING " When querying pkg-config for dbus-1.  An error was reported:\n${_dbus_query_output}")
!       SET(_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")
--- 1404,1430 ----
    IF(QT_QCONFIG MATCHES "qdbus")
  
!     # if the dbus library isn't found, we'll assume its not required to build
!     # shared Qt on Linux doesn't require it
!     IF(NOT QT_DBUS_LIBRARY)
!       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)
!       ENDIF(_dbus_result MATCHES 0)
  
!       FIND_LIBRARY(QT_DBUS_LIBRARY NAMES dbus-1 PATHS ${_dbus_query_output} )
  
!       IF(QT_DBUS_LIBRARY)
!         SET(QT_QTDBUS_LIB_DEPENDENCIES ${QT_QTDBUS_LIB_DEPENDENCIES} ${QT_DBUS_LIBRARY})
!       ENDIF(QT_DBUS_LIBRARY)
  
!       MARK_AS_ADVANCED(QT_DBUS_LIBRARY)
!     ENDIF(NOT QT_DBUS_LIBRARY)
  
    ENDIF(QT_QCONFIG MATCHES "qdbus")
***************
*** 1431,1460 ****
    ## glib
    IF(QT_QCONFIG MATCHES "glib")
      # Qt 4.2.0+ uses glib-2.0
!     EXECUTE_PROCESS(COMMAND pkg-config --libs-only-L glib-2.0 gthread-2.0
!       OUTPUT_VARIABLE _glib_query_output
!       RESULT_VARIABLE _glib_result
!       ERROR_VARIABLE _glib_query_output )
  
!     IF(_glib_result MATCHES 0)
!       STRING(REPLACE "-L" "" _glib_query_output "${_glib_query_output}")
!       SEPARATE_ARGUMENTS(_glib_query_output)
!     ELSE(_glib_result MATCHES 0)
!       MESSAGE(WARNING " When querying pkg-config for glib-2.0.  An error was reported:\n${_glib_query_output}")
!       SET(_glib_query_output)
!     ENDIF(_glib_result MATCHES 0)
  
!     FIND_LIBRARY(QT_GLIB_LIBRARY NAMES glib-2.0 PATHS ${_glib_query_output} )
!     FIND_LIBRARY(QT_GTHREAD_LIBRARY NAMES gthread-2.0 PATHS ${_glib_query_output} )
  
!     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}
!           ${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY})
!     ENDIF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
  
!     MARK_AS_ADVANCED(QT_GLIB_LIBRARY)
!     MARK_AS_ADVANCED(QT_GTHREAD_LIBRARY)
    ENDIF(QT_QCONFIG MATCHES "glib")
    
--- 1432,1464 ----
    ## glib
    IF(QT_QCONFIG MATCHES "glib")
+     
+     # if the glib libraries aren't found, we'll assume its not required to build
+     # shared Qt on Linux doesn't require it
+ 
      # Qt 4.2.0+ uses glib-2.0
!     IF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
!       EXECUTE_PROCESS(COMMAND pkg-config --libs-only-L glib-2.0 gthread-2.0
!         OUTPUT_VARIABLE _glib_query_output
!         RESULT_VARIABLE _glib_result
!         ERROR_VARIABLE _glib_query_output )
  
!       IF(_glib_result MATCHES 0)
!         STRING(REPLACE "-L" "" _glib_query_output "${_glib_query_output}")
!         SEPARATE_ARGUMENTS(_glib_query_output)
!       ELSE(_glib_result MATCHES 0)
!         SET(_glib_query_output)
!       ENDIF(_glib_result MATCHES 0)
  
!       FIND_LIBRARY(QT_GLIB_LIBRARY NAMES glib-2.0 PATHS ${_glib_query_output} )
!       FIND_LIBRARY(QT_GTHREAD_LIBRARY NAMES gthread-2.0 PATHS ${_glib_query_output} )
  
!       IF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY)
!         SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES}
!             ${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY})
!       ENDIF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY)
  
!       MARK_AS_ADVANCED(QT_GLIB_LIBRARY)
!       MARK_AS_ADVANCED(QT_GTHREAD_LIBRARY)
!     ENDIF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
    ENDIF(QT_QCONFIG MATCHES "glib")