[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.94 1.95

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:

ENH:  Allow users to recover from trying to use an improperly installed Qt
      without removing their cache, fixing their environment and trying again.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.94
retrieving revision 1.95
diff -C 2 -d -r1.94 -r1.95
*** FindQt4.cmake	14 Feb 2008 06:11:20 -0000	1.94
--- FindQt4.cmake	5 Mar 2008 17:53:44 -0000	1.95
***************
*** 384,413 ****
    
    # ask qmake for the binary dir
!   IF (NOT QT_BINARY_DIR)
       EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}
          ARGS "-query QT_INSTALL_BINS"
          OUTPUT_VARIABLE qt_bins )
       SET(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "")
!   ENDIF (NOT QT_BINARY_DIR)
  
    # ask qmake for the include dir
!   IF (NOT QT_HEADERS_DIR)
        EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
          ARGS "-query QT_INSTALL_HEADERS" 
          OUTPUT_VARIABLE qt_headers )
        SET(QT_HEADERS_DIR ${qt_headers} CACHE INTERNAL "")
!   ENDIF(NOT QT_HEADERS_DIR)
  
  
    # ask qmake for the documentation directory
!   IF (NOT QT_DOC_DIR)
      EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
        ARGS "-query QT_INSTALL_DOCS"
        OUTPUT_VARIABLE qt_doc_dir )
      SET(QT_DOC_DIR ${qt_doc_dir} CACHE PATH "The location of the Qt docs")
!   ENDIF (NOT QT_DOC_DIR)
  
    # ask qmake for the mkspecs directory
!   IF (NOT QT_MKSPECS_DIR)
      EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
        ARGS "-query QMAKE_MKSPECS"
--- 384,413 ----
    
    # ask qmake for the binary dir
!   IF (QT_LIBRARY_DIR AND NOT QT_BINARY_DIR)
       EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}
          ARGS "-query QT_INSTALL_BINS"
          OUTPUT_VARIABLE qt_bins )
       SET(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "")
!   ENDIF (QT_LIBRARY_DIR AND NOT QT_BINARY_DIR)
  
    # ask qmake for the include dir
!   IF (QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR)
        EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
          ARGS "-query QT_INSTALL_HEADERS" 
          OUTPUT_VARIABLE qt_headers )
        SET(QT_HEADERS_DIR ${qt_headers} CACHE INTERNAL "")
!   ENDIF(QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR)
  
  
    # ask qmake for the documentation directory
!   IF (QT_LIBRARY_DIR AND NOT QT_DOC_DIR)
      EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
        ARGS "-query QT_INSTALL_DOCS"
        OUTPUT_VARIABLE qt_doc_dir )
      SET(QT_DOC_DIR ${qt_doc_dir} CACHE PATH "The location of the Qt docs")
!   ENDIF (QT_LIBRARY_DIR AND NOT QT_DOC_DIR)
  
    # ask qmake for the mkspecs directory
!   IF (QT_LIBRARY_DIR AND NOT QT_MKSPECS_DIR)
      EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
        ARGS "-query QMAKE_MKSPECS"
***************
*** 417,429 ****
        DOC "The location of the Qt mkspecs containing qconfig.pri"
        NO_DEFAULT_PATH )
!   ENDIF (NOT QT_MKSPECS_DIR)
  
    # ask qmake for the plugins directory
!   IF (NOT QT_PLUGINS_DIR)
      EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
        ARGS "-query QT_INSTALL_PLUGINS"
        OUTPUT_VARIABLE qt_plugins_dir )
      SET(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins")
!   ENDIF (NOT QT_PLUGINS_DIR)
    ########################################
    #
--- 417,429 ----
        DOC "The location of the Qt mkspecs containing qconfig.pri"
        NO_DEFAULT_PATH )
!   ENDIF (QT_LIBRARY_DIR AND NOT QT_MKSPECS_DIR)
  
    # ask qmake for the plugins directory
!   IF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR)
      EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
        ARGS "-query QT_INSTALL_PLUGINS"
        OUTPUT_VARIABLE qt_plugins_dir )
      SET(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins")
!   ENDIF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR)
    ########################################
    #