[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.160 1.161

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:
ENH:  Better error message for those who switch from Qt3 to Qt4 and don't clean their cache file.


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.160
retrieving revision 1.161
diff -C 2 -d -r1.160 -r1.161
*** FindQt4.cmake	6 May 2009 15:21:22 -0000	1.160
--- FindQt4.cmake	19 May 2009 15:38:18 -0000	1.161
***************
*** 292,299 ****
  IF(QT_QT_LIBRARY)
    IF(Qt4_FIND_REQUIRED)
!     MESSAGE( FATAL_ERROR "Qt3 and Qt4 cannot be used together in one project.")
    ELSE(Qt4_FIND_REQUIRED)
      IF(NOT Qt4_FIND_QUIETLY)
!       MESSAGE( STATUS    "Qt3 and Qt4 cannot be used together in one project.")
      ENDIF(NOT Qt4_FIND_QUIETLY)
      RETURN()
--- 292,299 ----
  IF(QT_QT_LIBRARY)
    IF(Qt4_FIND_REQUIRED)
!     MESSAGE( FATAL_ERROR "Qt3 and Qt4 cannot be used together in one project.  If switching to Qt4, the CMakeCache.txt needs to be cleaned.")
    ELSE(Qt4_FIND_REQUIRED)
      IF(NOT Qt4_FIND_QUIETLY)
!       MESSAGE( STATUS    "Qt3 and Qt4 cannot be used together in one project.  If switching to Qt4, the CMakeCache.txt needs to be cleaned.")
      ENDIF(NOT Qt4_FIND_QUIETLY)
      RETURN()
***************
*** 631,635 ****
    
    # Set QT_INCLUDE_DIR by removine "/QtCore" in the string ${QT_QTCORE_INCLUDE_DIR}
!   IF( QT_QTCORE_INCLUDE_DIR AND NOT QT_INCLUDE_DIR)
      IF (QT_USE_FRAMEWORKS)
        SET(QT_INCLUDE_DIR ${QT_HEADERS_DIR})
--- 631,635 ----
    
    # Set QT_INCLUDE_DIR by removine "/QtCore" in the string ${QT_QTCORE_INCLUDE_DIR}
!   IF( QT_QTCORE_INCLUDE_DIR )
      IF (QT_USE_FRAMEWORKS)
        SET(QT_INCLUDE_DIR ${QT_HEADERS_DIR})
***************
*** 638,642 ****
        SET( QT_INCLUDE_DIR ${qt4_include_dir})
      ENDIF (QT_USE_FRAMEWORKS)
!   ENDIF( QT_QTCORE_INCLUDE_DIR AND NOT QT_INCLUDE_DIR)
  
    IF( NOT QT_INCLUDE_DIR)
--- 638,642 ----
        SET( QT_INCLUDE_DIR ${qt4_include_dir})
      ENDIF (QT_USE_FRAMEWORKS)
!   ENDIF( QT_QTCORE_INCLUDE_DIR )
  
    IF( NOT QT_INCLUDE_DIR)