[Cmake-commits] [cmake-commits] alex committed FindQt4.cmake 1.173 1.174

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:
some syncing with FindQt4.cmake from KDE, no functional changes

-the mark_as_advanced() calls for the variables coming from qmake are now in
the corresponding section, and not in the section where the include dirs are
foudn

Alex


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.173
retrieving revision 1.174
diff -C 2 -d -r1.173 -r1.174
*** FindQt4.cmake	7 Oct 2009 22:51:39 -0000	1.173
--- FindQt4.cmake	8 Nov 2009 18:01:46 -0000	1.174
***************
*** 565,568 ****
--- 565,573 ----
    ENDIF (QT_LIBRARY_DIR AND NOT QT_TRANSLATIONS_DIR  OR  QT_QMAKE_CHANGED)
  
+   # Make variables changeble to the advanced user
+   MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_DOC_DIR QT_MKSPECS_DIR
+                     QT_PLUGINS_DIR QT_TRANSLATIONS_DIR)
+ 
+ 
    ########################################
    #
***************
*** 614,618 ****
        )
    ENDFOREACH(QT_MODULE)
!   
    IF(WIN32)
      SET(QT_MODULES ${QT_MODULES} QAxContainer QAxServer)
--- 619,623 ----
        )
    ENDFOREACH(QT_MODULE)
! 
    IF(WIN32)
      SET(QT_MODULES ${QT_MODULES} QAxContainer QAxServer)
***************
*** 629,633 ****
        )
    ENDIF(WIN32)
!   
    # Set QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR
    FIND_PATH(QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR QDesignerComponents
--- 634,638 ----
        )
    ENDIF(WIN32)
! 
    # Set QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR
    FIND_PATH(QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR QDesignerComponents
***************
*** 653,657 ****
      NO_DEFAULT_PATH
      )
!   
    # Set QT_INCLUDE_DIR by removine "/QtCore" in the string ${QT_QTCORE_INCLUDE_DIR}
    IF( QT_QTCORE_INCLUDE_DIR )
--- 658,665 ----
      NO_DEFAULT_PATH
      )
! 
!   # Make variables changeble to the advanced user
!   MARK_AS_ADVANCED( QT_INCLUDE_DIR )
! 
    # Set QT_INCLUDE_DIR by removine "/QtCore" in the string ${QT_QTCORE_INCLUDE_DIR}
    IF( QT_QTCORE_INCLUDE_DIR )
***************
*** 670,677 ****
    ENDIF( NOT QT_INCLUDE_DIR)
  
-   # Make variables changeble to the advanced user
-   MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_DOC_DIR QT_MKSPECS_DIR
-                     QT_PLUGINS_DIR QT_TRANSLATIONS_DIR)
- 
    # Set QT_INCLUDES
    SET( QT_INCLUDES ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR} )
--- 678,681 ----
***************
*** 736,741 ****
    ENDIF("${QT_EDITION}" MATCHES "DesktopLight")
  
! 
! 
  
    # find the libraries
--- 740,748 ----
    ENDIF("${QT_EDITION}" MATCHES "DesktopLight")
  
!   ########################################
!   #
!   #       Setting the LIBRARY-Variables
!   #
!   ########################################
  
    # find the libraries