[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.118 1.119

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:

ENH:  Make Qt not found if the QtCore library can't be found.
Also report an error when trying to use MSVC with Qt built by mingw.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.118
retrieving revision 1.119
diff -C 2 -d -r1.118 -r1.119
*** FindQt4.cmake	9 May 2008 15:50:56 -0000	1.118
--- FindQt4.cmake	21 May 2008 17:36:37 -0000	1.119
***************
*** 268,271 ****
--- 268,272 ----
  #  macro for asking qmake to process pro files
  MACRO(QT_QUERY_QMAKE outvar invar)
+   IF(QT_QMAKE_EXECUTABLE)
    FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake/tmp.pro
      "message(CMAKE_MESSAGE<$$${invar}>)")
***************
*** 290,293 ****
--- 291,295 ----
    ENDIF(_qmake_result)
  
+   ENDIF(QT_QMAKE_EXECUTABLE)
  ENDMACRO(QT_QUERY_QMAKE)
  
***************
*** 761,764 ****
--- 763,774 ----
  
    IF( NOT QT_QTCORE_LIBRARY_DEBUG AND NOT QT_QTCORE_LIBRARY_RELEASE )
+     
+     # try dropping a hint if trying to use Visual Studio with Qt built by mingw
+     IF(QT_LIBRARY_DIR AND MSVC)
+       IF(EXISTS ${QT_LIBRARY_DIR}/libqtmain.a)
+         MESSAGE( FATAL_ERROR "It appears you're trying to use Visual Studio with Qt built by mingw")
+       ENDIF(EXISTS ${QT_LIBRARY_DIR}/libqtmain.a)
+     ENDIF(QT_LIBRARY_DIR AND MSVC)
+ 
      IF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
        MESSAGE( FATAL_ERROR "Could NOT find QtCore. Check ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log for more details.")
***************
*** 1306,1315 ****
  
    # if the includes,libraries,moc,uic and rcc are found then we have it
!   IF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
      SET( QT4_FOUND "YES" )
      INCLUDE(FindPackageMessage)
      FIND_PACKAGE_MESSAGE(Qt4 "Found Qt-Version ${QTVERSION}"
        "[${QT_LIBRARY_DIR}][${QT_INCLUDE_DIR}][${QT_MOC_EXECUTABLE}][${QT_UIC_EXECUTABLE}][${QT_RCC_EXECUTABLE}]")
!   ELSE( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
      SET( QT4_FOUND "NO")
      SET(QT_QMAKE_EXECUTABLE "${QT_QMAKE_EXECUTABLE}-NOTFOUND" CACHE FILEPATH "Invalid qmake found" FORCE)
--- 1316,1327 ----
  
    # if the includes,libraries,moc,uic and rcc are found then we have it
!   IF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND 
!       QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE AND QT_QTCORE_LIBRARY)
      SET( QT4_FOUND "YES" )
      INCLUDE(FindPackageMessage)
      FIND_PACKAGE_MESSAGE(Qt4 "Found Qt-Version ${QTVERSION}"
        "[${QT_LIBRARY_DIR}][${QT_INCLUDE_DIR}][${QT_MOC_EXECUTABLE}][${QT_UIC_EXECUTABLE}][${QT_RCC_EXECUTABLE}]")
!   ELSE( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND
!         QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE AND QT_QTCORE_LIBRARY)
      SET( QT4_FOUND "NO")
      SET(QT_QMAKE_EXECUTABLE "${QT_QMAKE_EXECUTABLE}-NOTFOUND" CACHE FILEPATH "Invalid qmake found" FORCE)
***************
*** 1317,1321 ****
        MESSAGE( FATAL_ERROR "Qt libraries, includes, moc, uic or/and rcc NOT found!")
      ENDIF( Qt4_FIND_REQUIRED)
!   ENDIF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND  QT_RCC_EXECUTABLE)
    SET(QT_FOUND ${QT4_FOUND})
  
--- 1329,1335 ----
        MESSAGE( FATAL_ERROR "Qt libraries, includes, moc, uic or/and rcc NOT found!")
      ENDIF( Qt4_FIND_REQUIRED)
!   ENDIF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND 
!          QT_UIC_EXECUTABLE AND  QT_RCC_EXECUTABLE AND QT_QTCORE_LIBRARY)
!   
    SET(QT_FOUND ${QT4_FOUND})