[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.106 1.107

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:

STYLE:  Improve documentation by expanding on how UseQt4.cmake fits in.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.106
retrieving revision 1.107
diff -C 2 -d -r1.106 -r1.107
*** FindQt4.cmake	18 Mar 2008 21:54:40 -0000	1.106
--- FindQt4.cmake	18 Mar 2008 22:37:28 -0000	1.107
***************
*** 3,11 ****
  # The most important issue is that the Qt4 qmake is available via the system path.
  # This qmake is then used to detect basically everything else.
! # This module defines a number of key variables and macros. First is 
! # QT_USE_FILE which is the path to a CMake file that can be included to compile
! # Qt 4 applications and libraries.  By default, the QtCore and QtGui 
  # libraries are loaded. This behavior can be changed by setting one or more 
! # of the following variables to true:
  #                    QT_DONT_USE_QTCORE
  #                    QT_DONT_USE_QTGUI
--- 3,11 ----
  # The most important issue is that the Qt4 qmake is available via the system path.
  # This qmake is then used to detect basically everything else.
! # This module defines a number of key variables and macros. 
! # First is QT_USE_FILE which is the path to a CMake file that can be included 
! # to compile Qt 4 applications and libraries.  By default, the QtCore and QtGui 
  # libraries are loaded. This behavior can be changed by setting one or more 
! # of the following variables to true before doing INCLUDE(${QT_USE_FILE}):
  #                    QT_DONT_USE_QTCORE
  #                    QT_DONT_USE_QTGUI
***************
*** 31,38 ****
  #                    QT_USE_PHONON
  #
! # If you are using Qt4 via UseQt4.cmake instead of FIND_PACKAGE(Qt4), all the 
! # libraries required are stored in the variable QT_LIBRARIES.
! # Add this variable to your TARGET_LINK_LIBRARIES.  Includes and definitions
! # needed for compiling Qt code are then already set up by including the QT_USE_FILE.
  #  
  #  macro QT4_WRAP_CPP(outfiles inputfile ... OPTIONS ...)
--- 31,49 ----
  #                    QT_USE_PHONON
  #
! # The file pointed to by QT_USE_FILE will set up your compile environment
! # by adding include directories, preprocessor defines, and populate a
! # QT_LIBRARIES variable containing all the Qt libraries and their dependencies.
! # Add the QT_LIBRARIES variable to your TARGET_LINK_LIBRARIES.
! #
! # Typical usage could be something like:
! #   FIND_PACKAGE(Qt4)
! #   SET(QT_USE_QTXML 1)
! #   INCLUDE(${QT_USE_FILE})
! #   ADD_EXECUTABLE(myexe main.cpp)
! #   TARGET_LINK_LIBRARIES(myexe ${QT_LIBRARIES})
! #
! #
! # There are also some files that need processing by some Qt tools such as moc
! # and uic.  Listed below are macros that may be used to process those files.
  #  
  #  macro QT4_WRAP_CPP(outfiles inputfile ... OPTIONS ...)
***************
*** 124,129 ****
  #  QT_QTXMLPATTERNS_FOUND   True if QtXmlPatterns was found.
  #  QT_PHONON_FOUND          True if phonon was found.
! #                      
  #  QT_DEFINITIONS   Definitions to use when compiling code that uses Qt.
  #                  
  #  QT_INCLUDES      List of paths to all include directories of 
--- 135,145 ----
  #  QT_QTXMLPATTERNS_FOUND   True if QtXmlPatterns was found.
  #  QT_PHONON_FOUND          True if phonon was found.
! #
! #
  #  QT_DEFINITIONS   Definitions to use when compiling code that uses Qt.
+ #                   You do not need to use this if you include QT_USE_FILE.
+ #                   The QT_USE_FILE will also define QT_DEBUG and QT_NO_DEBUG
+ #                   to fit your current build type.  Those are not contained
+ #                   in QT_DEFINITIONS.
  #                  
  #  QT_INCLUDES      List of paths to all include directories of 
***************
*** 132,136 ****
--- 148,157 ----
  #                   all other INCLUDE_DIRS are
  #                   only added if they are found.
+ #                   You do not need to use this if you include QT_USE_FILE.
  #   
+ #
+ #  Include directories for the Qt modules are listed here.
+ #  You do not need to use these variables if you include QT_USE_FILE.
+ #
  #  QT_INCLUDE_DIR              Path to "include" of Qt4
  #  QT_QT_INCLUDE_DIR           Path to "include/Qt" 
***************
*** 163,167 ****
  #
  # The Qt toolkit may contain both debug and release libraries.
! #  In that case, the following library variables will contain both.
  #
  #  QT_QT3SUPPORT_LIBRARY            The Qt3Support library
--- 184,190 ----
  #
  # The Qt toolkit may contain both debug and release libraries.
! # In that case, the following library variables will contain both.
! # You do not need to use these variables if you include QT_USE_FILE,
! # and use QT_LIBRARIES.
  #
  #  QT_QT3SUPPORT_LIBRARY            The Qt3Support library