[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.144 1.145

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Jan 26 10:12:39 EST 2009


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

Modified Files:
	FindQt4.cmake 
Log Message:

BUG:  Fixed recent regression when finding some includes.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.144
retrieving revision 1.145
diff -C 2 -d -r1.144 -r1.145
*** FindQt4.cmake	23 Jan 2009 21:52:15 -0000	1.144
--- FindQt4.cmake	26 Jan 2009 15:12:37 -0000	1.145
***************
*** 528,532 ****
    FIND_PATH(QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR QDesignerComponents
      PATHS
!     ${QT_INCLUDE_DIR}/QtDesigner
      ${QT_LIBRARY_DIR}/QtDesigner.framework/Headers
      NO_DEFAULT_PATH
--- 528,532 ----
    FIND_PATH(QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR QDesignerComponents
      PATHS
!     ${QT_HEADERS_DIR}/QtDesigner
      ${QT_LIBRARY_DIR}/QtDesigner.framework/Headers
      NO_DEFAULT_PATH
***************
*** 536,540 ****
    FIND_PATH(QT_QTASSISTANT_INCLUDE_DIR QAssistantClient
      PATHS
!     ${QT_INCLUDE_DIR}/QtAssistant
      ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
      NO_DEFAULT_PATH
--- 536,540 ----
    FIND_PATH(QT_QTASSISTANT_INCLUDE_DIR QAssistantClient
      PATHS
!     ${QT_HEADERS_DIR}/QtAssistant
      ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
      NO_DEFAULT_PATH
***************
*** 544,548 ****
    FIND_PATH(QT_QTASSISTANTCLIENT_INCLUDE_DIR QAssistantClient
      PATHS
!     ${QT_INCLUDE_DIR}/QtAssistant
      ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
      NO_DEFAULT_PATH
--- 544,548 ----
    FIND_PATH(QT_QTASSISTANTCLIENT_INCLUDE_DIR QAssistantClient
      PATHS
!     ${QT_HEADERS_DIR}/QtAssistant
      ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
      NO_DEFAULT_PATH



More information about the Cmake-commits mailing list