[Cmake-commits] [cmake-commits] hoffman committed FindQt4.cmake 1.96.2.4 1.96.2.5

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	FindQt4.cmake 
Log Message:
ENH: merge in findqt change from main tree


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.96.2.4
retrieving revision 1.96.2.5
diff -C 2 -d -r1.96.2.4 -r1.96.2.5
*** FindQt4.cmake	2 Apr 2008 13:16:02 -0000	1.96.2.4
--- FindQt4.cmake	2 Apr 2008 15:07:52 -0000	1.96.2.5
***************
*** 372,375 ****
--- 372,377 ----
        ARGS "-query QT_INSTALL_LIBS"
        OUTPUT_VARIABLE QT_LIBRARY_DIR_TMP )
+     # make sure we have / and not \ as qmake gives on windows
+     FILE(TO_CMAKE_PATH "${QT_LIBRARY_DIR_TMP}" QT_LIBRARY_DIR_TMP)
      IF(EXISTS "${QT_LIBRARY_DIR_TMP}")
        SET(QT_LIBRARY_DIR ${QT_LIBRARY_DIR_TMP} CACHE PATH "Qt library dir")
***************
*** 395,400 ****
    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)
--- 397,404 ----
    IF (QT_LIBRARY_DIR AND NOT QT_BINARY_DIR)
       EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}
!        ARGS "-query QT_INSTALL_BINS"
!        OUTPUT_VARIABLE qt_bins )
!      # make sure we have / and not \ as qmake gives on windows
!      FILE(TO_CMAKE_PATH "${qt_bins}" qt_bins)
       SET(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "")
    ENDIF (QT_LIBRARY_DIR AND NOT QT_BINARY_DIR)
***************
*** 404,408 ****
        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)
--- 408,414 ----
        EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
          ARGS "-query QT_INSTALL_HEADERS" 
!         OUTPUT_VARIABLE qt_headers ) 
!       # make sure we have / and not \ as qmake gives on windows
!       FILE(TO_CMAKE_PATH "${qt_headers}" qt_headers)
        SET(QT_HEADERS_DIR ${qt_headers} CACHE INTERNAL "")
    ENDIF(QT_LIBRARY_DIR AND NOT QT_HEADERS_DIR)
***************
*** 414,417 ****
--- 420,425 ----
        ARGS "-query QT_INSTALL_DOCS"
        OUTPUT_VARIABLE qt_doc_dir )
+     # make sure we have / and not \ as qmake gives on windows
+     FILE(TO_CMAKE_PATH "${qt_doc_dir}" 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)
***************
*** 422,426 ****
        ARGS "-query QMAKE_MKSPECS"
        OUTPUT_VARIABLE qt_mkspecs_dirs )
!     STRING(REPLACE ":" ";" qt_mkspecs_dirs "${qt_mkspecs_dirs}")
      FIND_PATH(QT_MKSPECS_DIR qconfig.pri PATHS ${qt_mkspecs_dirs}
        DOC "The location of the Qt mkspecs containing qconfig.pri"
--- 430,438 ----
        ARGS "-query QMAKE_MKSPECS"
        OUTPUT_VARIABLE qt_mkspecs_dirs )
!     # do not replace : on windows as it might be a drive letter
!     # and windows should already use ; as a separator
!     IF(UNIX)
!       STRING(REPLACE ":" ";" qt_mkspecs_dirs "${qt_mkspecs_dirs}")
!     ENDIF(UNIX)
      FIND_PATH(QT_MKSPECS_DIR qconfig.pri PATHS ${qt_mkspecs_dirs}
        DOC "The location of the Qt mkspecs containing qconfig.pri"
***************
*** 433,436 ****
--- 445,450 ----
        ARGS "-query QT_INSTALL_PLUGINS"
        OUTPUT_VARIABLE qt_plugins_dir )
+     # make sure we have / and not \ as qmake gives on windows
+     FILE(TO_CMAKE_PATH "${qt_plugins_dir}" 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)
***************
*** 892,897 ****
--- 906,913 ----
    QT_QUERY_QMAKE(QT_UIC_EXECUTABLE_INTERNAL "QMAKE_UIC")
  
+   # make sure we have / and not \ as qmake gives on windows
    FILE(TO_CMAKE_PATH 
      "${QT_MOC_EXECUTABLE_INTERNAL}" QT_MOC_EXECUTABLE_INTERNAL)
+   # make sure we have / and not \ as qmake gives on windows
    FILE(TO_CMAKE_PATH 
      "${QT_UIC_EXECUTABLE_INTERNAL}" QT_UIC_EXECUTABLE_INTERNAL)