[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.96 1.97 UseQt4.cmake 1.13 1.14

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake UseQt4.cmake 
Log Message:

ENH:  Add support for Qt 4.4's phonon module.
      Add new Qt 4.4 modules in UseQt4.cmake



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.96
retrieving revision 1.97
diff -C 2 -d -r1.96 -r1.97
*** FindQt4.cmake	13 Mar 2008 19:29:28 -0000	1.96
--- FindQt4.cmake	13 Mar 2008 23:12:46 -0000	1.97
***************
*** 29,32 ****
--- 29,33 ----
  #                    QT_USE_QTWEBKIT
  #                    QT_USE_QTXMLPATTERNS
+ #                    QT_USE_PHONON
  #
  # All the libraries required are stored in a variable called QT_LIBRARIES.  
***************
*** 121,124 ****
--- 122,126 ----
  #  QT_QTWEBKIT_FOUND        True if QtWebKit was found.
  #  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.
***************
*** 152,155 ****
--- 154,158 ----
  #  QT_QTWEBKIT_INCLUDE_DIR     Path to "include/QtWebKit"
  #  QT_QTXMLPATTERNS_INCLUDE_DIR  Path to "include/QtXmlPatterns"
+ #  QT_PHONON_INCLUDE_DIR       Path to "include/phonon"
  #                            
  #  QT_LIBRARY_DIR              Path to "lib" of Qt4
***************
*** 183,186 ****
--- 186,190 ----
  #  QT_QTWEBKIT_LIBRARY              The QtWebKit library
  #  QT_QTXMLPATTERNS_LIBRARY         The QtXmlPatterns library
+ #  QT_PHONON_LIBRARY                The phonon library
  #  
  # also defined, but NOT for general use are
***************
*** 619,622 ****
--- 623,633 ----
      NO_DEFAULT_PATH
      )
+   
+   # Set QT_PHONON_INCLUDE_DIR
+   FIND_PATH(QT_PHONON_INCLUDE_DIR phonon
+     PATHS
+     ${QT_INCLUDE_DIR}/phonon
+     NO_DEFAULT_PATH
+     )
  
    # Make variables changeble to the advanced user
***************
*** 731,734 ****
--- 742,749 ----
    FIND_LIBRARY(QT_QTXMLPATTERNS_LIBRARY_RELEASE NAMES QtXmlPatterns QtXmlPatterns4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
    FIND_LIBRARY(QT_QTXMLPATTERNS_LIBRARY_DEBUG   NAMES QtXmlPatterns_debug QtXmlPatternsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+   
+   # Set QT_PHONON_LIBRARY
+   FIND_LIBRARY(QT_PHONON_LIBRARY_RELEASE NAMES phonon phonon4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
+   FIND_LIBRARY(QT_PHONON_LIBRARY_DEBUG   NAMES phonon_debug phonond4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
  
    ############################################
***************
*** 808,811 ****
--- 823,827 ----
    _QT4_ADJUST_LIB_VARS(QTWEBKIT)
    _QT4_ADJUST_LIB_VARS(QTXMLPATTERNS)
+   _QT4_ADJUST_LIB_VARS(PHONON)
  
    # platform dependent libraries

Index: UseQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UseQt4.cmake,v
retrieving revision 1.13
retrieving revision 1.14
diff -C 2 -d -r1.13 -r1.14
*** UseQt4.cmake	1 Feb 2008 17:02:19 -0000	1.13
--- UseQt4.cmake	13 Mar 2008 23:12:46 -0000	1.14
***************
*** 72,75 ****
--- 72,93 ----
  ENDIF (QT_USE_QTUITOOLS)
  
+ IF (QT_USE_QTHELP)
+   QT_MODULE_SETUP(HELP)
+ ENDIF (QT_USE_QTHELP)
+ 
+ IF (QT_USE_QTWEBKIT)
+   QT_MODULE_SETUP(WEBKIT)
+ ENDIF (QT_USE_QTWEBKIT)
+ 
+ IF (QT_USE_PHONON)
+   IF (QT_PHONON_FOUND)
+     ADD_DEFINITIONS(-DQT_PHONON_LIB)
+     INCLUDE_DIRECTORIES(${QT_PHONON_INCLUDE_DIR})
+     SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_PHONON_LIBRARY})
+   ELSE (QT_PHONON_FOUND)
+     MESSAGE("Qt ${module} library not found.")
+   ENDIF (QT_PHONON_FOUND)
+ ENDIF (QT_USE_PHONON)
+ 
  IF (NOT QT_DONT_USE_QTGUI)
    QT_MODULE_SETUP(GUI)
***************
*** 88,91 ****
--- 106,113 ----
  ENDIF (QT_USE_QTSQL)
  
+ IF (QT_USE_QTXMLPATTERNS)
+   QT_MODULE_SETUP(XMLPATTERNS)
+ ENDIF (QT_USE_QTXMLPATTERNS)
+ 
  IF (QT_USE_QTNETWORK)
    QT_MODULE_SETUP(NETWORK)