[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.123 1.124

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:

BUG:  Watch for empty qconfig.pri files.  Fixes #7287.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.123
retrieving revision 1.124
diff -C 2 -d -r1.123 -r1.124
*** FindQt4.cmake	6 Jun 2008 05:36:39 -0000	1.123
--- FindQt4.cmake	5 Jul 2008 15:57:57 -0000	1.124
***************
*** 1344,1350 ****
    IF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
      FILE(READ ${QT_MKSPECS_DIR}/qconfig.pri _qconfig_FILE_contents)
!     STRING(REGEX MATCH "QT_CONFIG[^\n]+" QT_QCONFIG ${_qconfig_FILE_contents})
!     STRING(REGEX MATCH "CONFIG[^\n]+" QT_CONFIG ${_qconfig_FILE_contents})
!     STRING(REGEX MATCH "EDITION[^\n]+" QT_EDITION ${_qconfig_FILE_contents})
    ENDIF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
    IF("${QT_EDITION}" MATCHES "DesktopLight")
--- 1344,1350 ----
    IF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
      FILE(READ ${QT_MKSPECS_DIR}/qconfig.pri _qconfig_FILE_contents)
!     STRING(REGEX MATCH "QT_CONFIG[^\n]+" QT_QCONFIG "${_qconfig_FILE_contents}")
!     STRING(REGEX MATCH "CONFIG[^\n]+" QT_CONFIG "${_qconfig_FILE_contents}")
!     STRING(REGEX MATCH "EDITION[^\n]+" QT_EDITION "${_qconfig_FILE_contents}")
    ENDIF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
    IF("${QT_EDITION}" MATCHES "DesktopLight")