[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.172 1.173

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:
Check for openssl-linked option with Qt 4.4+ before making ssl a dependency.


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.172
retrieving revision 1.173
diff -C 2 -d -r1.172 -r1.173
*** FindQt4.cmake	5 Oct 2009 15:21:30 -0000	1.172
--- FindQt4.cmake	7 Oct 2009 22:51:39 -0000	1.173
***************
*** 1520,1529 ****
  
    ## openssl
!   IF(QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN)
!     FIND_PACKAGE(OpenSSL)
!     IF(OPENSSL_LIBRARIES)
!       SET(QT_QTNETWORK_LIB_DEPENDENCIES ${QT_QTNETWORK_LIB_DEPENDENCIES} ${OPENSSL_LIBRARIES})
!     ENDIF(OPENSSL_LIBRARIES)
!   ENDIF(QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN)
    
    ## dbus
--- 1520,1538 ----
  
    ## openssl
!   IF(NOT Q_WS_WIN)
!     SET(_QT_NEED_OPENSSL 0)
!     IF(QT_VERSION_MINOR LESS 4 AND QT_QCONFIG MATCHES "openssl")
!       SET(_QT_NEED_OPENSSL 1)
!     ENDIF(QT_VERSION_MINOR LESS 4 AND QT_QCONFIG MATCHES "openssl")
!     IF(QT_VERSION_MINOR GREATER 3 AND QT_QCONFIG MATCHES "openssl-linked")
!       SET(_QT_NEED_OPENSSL 1)
!     ENDIF(QT_VERSION_MINOR GREATER 3 AND QT_QCONFIG MATCHES "openssl-linked")
!     IF(_QT_NEED_OPENSSL)
!       FIND_PACKAGE(OpenSSL)
!       IF(OPENSSL_LIBRARIES)
!         SET(QT_QTNETWORK_LIB_DEPENDENCIES ${QT_QTNETWORK_LIB_DEPENDENCIES} ${OPENSSL_LIBRARIES})
!       ENDIF(OPENSSL_LIBRARIES)
!     ENDIF(_QT_NEED_OPENSSL)
!   ENDIF(NOT Q_WS_WIN)
    
    ## dbus