[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.95 1.96
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Mar 13 15:29:30 EDT 2008
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv32544
Modified Files:
FindQt4.cmake
Log Message:
ENH: Add support for new modules in Qt 4.4. Fixes #6316.
Simplify and clarify some documentation.
BUG: Fix order of include paths (from KDE's FindQt4)
Fix find of Designer components debug library on Windows.
Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.95
retrieving revision 1.96
diff -C 2 -d -r1.95 -r1.96
*** FindQt4.cmake 5 Mar 2008 17:53:44 -0000 1.95
--- FindQt4.cmake 13 Mar 2008 19:29:28 -0000 1.96
***************
*** 25,31 ****
# QT_USE_QTDBUS
# QT_USE_QTSCRIPT
#
# All the libraries required are stored in a variable called QT_LIBRARIES.
! # Add this variable to your TARGET_LINK_LIBRARIES.
#
# macro QT4_WRAP_CPP(outfiles inputfile ... OPTIONS ...)
--- 25,36 ----
# QT_USE_QTDBUS
# QT_USE_QTSCRIPT
+ # QT_USE_QTASSISTANTCLIENT
+ # QT_USE_QTHELP
+ # QT_USE_QTWEBKIT
+ # QT_USE_QTXMLPATTERNS
#
# All the libraries required are stored in a variable called QT_LIBRARIES.
! # Add this variable to your TARGET_LINK_LIBRARIES. Inlcudes and definitions
! # needed for compiling Qt code is already set up by including the QT_USE_FILE.
#
# macro QT4_WRAP_CPP(outfiles inputfile ... OPTIONS ...)
***************
*** 93,115 ****
# QT4_FOUND If false, don't try to use Qt 4.
#
! # QT_EDITION Set to the edition of Qt (i.e. DesktopLight)
! # QT_EDITION_DESKTOPLIGHT True if QT_EDITION == DesktopLight
! # QT_QTCORE_FOUND True if QtCore was found.
! # QT_QTGUI_FOUND True if QtGui was found.
! # QT_QT3SUPPORT_FOUND True if Qt3Support was found.
! # QT_QTASSISTANT_FOUND True if QtAssistant was found.
! # QT_QTDBUS_FOUND True if QtDBus was found.
! # QT_QTDESIGNER_FOUND True if QtDesigner was found.
! # QT_QTDESIGNERCOMPONENTS True if QtDesignerComponents was found.
! # QT_QTMOTIF_FOUND True if QtMotif was found.
! # QT_QTNETWORK_FOUND True if QtNetwork was found.
! # QT_QTNSPLUGIN_FOUND True if QtNsPlugin was found.
! # QT_QTOPENGL_FOUND True if QtOpenGL was found.
! # QT_QTSQL_FOUND True if QtSql was found.
! # QT_QTXML_FOUND True if QtXml was found.
! # QT_QTSVG_FOUND True if QtSvg was found.
! # QT_QTSCRIPT_FOUND True if QtScript was found.
! # QT_QTTEST_FOUND True if QtTest was found.
! # QT_QTUITOOLS_FOUND True if QtUiTools was found.
#
# QT_DEFINITIONS Definitions to use when compiling code that uses Qt.
--- 98,124 ----
# QT4_FOUND If false, don't try to use Qt 4.
#
! # QT_EDITION Set to the edition of Qt (i.e. DesktopLight)
! # QT_EDITION_DESKTOPLIGHT True if QT_EDITION == DesktopLight
! # QT_QTCORE_FOUND True if QtCore was found.
! # QT_QTGUI_FOUND True if QtGui was found.
! # QT_QT3SUPPORT_FOUND True if Qt3Support was found.
! # QT_QTASSISTANT_FOUND True if QtAssistant was found.
! # QT_QTDBUS_FOUND True if QtDBus was found.
! # QT_QTDESIGNER_FOUND True if QtDesigner was found.
! # QT_QTDESIGNERCOMPONENTS True if QtDesignerComponents was found.
! # QT_QTMOTIF_FOUND True if QtMotif was found.
! # QT_QTNETWORK_FOUND True if QtNetwork was found.
! # QT_QTNSPLUGIN_FOUND True if QtNsPlugin was found.
! # QT_QTOPENGL_FOUND True if QtOpenGL was found.
! # QT_QTSQL_FOUND True if QtSql was found.
! # QT_QTXML_FOUND True if QtXml was found.
! # QT_QTSVG_FOUND True if QtSvg was found.
! # QT_QTSCRIPT_FOUND True if QtScript was found.
! # QT_QTTEST_FOUND True if QtTest was found.
! # QT_QTUITOOLS_FOUND True if QtUiTools was found.
! # QT_QTASSISTANTCLIENT_FOUND True if QtAssistantClient was found.
! # QT_QTHELP_FOUND True if QtHelp was found.
! # QT_QTWEBKIT_FOUND True if QtWebKit was found.
! # QT_QTXMLPATTERNS_FOUND True if QtXmlPatterns was found.
#
# QT_DEFINITIONS Definitions to use when compiling code that uses Qt.
***************
*** 139,142 ****
--- 148,155 ----
# QT_QTSCRIPT_INCLUDE_DIR Path to "include/QtScript"
# QT_QTTEST_INCLUDE_DIR Path to "include/QtTest"
+ # QT_QTASSISTANTCLIENT_INCLUDE_DIR Path to "include/QtAssistant"
+ # QT_QTHELP_INCLUDE_DIR Path to "include/QtHelp"
+ # QT_QTWEBKIT_INCLUDE_DIR Path to "include/QtWebKit"
+ # QT_QTXMLPATTERNS_INCLUDE_DIR Path to "include/QtXmlPatterns"
#
# QT_LIBRARY_DIR Path to "lib" of Qt4
***************
*** 144,224 ****
# QT_PLUGINS_DIR Path to "plugins" for Qt4
#
- # For every library of Qt there are three variables:
- # QT_QTFOO_LIBRARY_RELEASE, which contains the full path to the release version, if it exists
- # QT_QTFOO_LIBRARY_DEBUG, which contains the full path to the debug version, if it exists
- # QT_QTFOO_LIBRARY, the full path to the release and/or debug version
- #
- # So there are the following variables:
- # The Qt3Support library: QT_QT3SUPPORT_LIBRARY
- # QT_QT3SUPPORT_LIBRARY_RELEASE
- # QT_QT3SUPPORT_DEBUG
- #
- # The QtAssistant library: QT_QTASSISTANT_LIBRARY
- # QT_QTASSISTANT_LIBRARY_RELEASE
- # QT_QTASSISTANT_LIBRARY_DEBUG
- #
- # The QtCore library: QT_QTCORE_LIBRARY
- # QT_QTCORE_LIBRARY_RELEASE
- # QT_QTCORE_LIBRARY_DEBUG
- #
- # The QtDBus library: QT_QTDBUS_LIBRARY
- # QT_QTDBUS_LIBRARY_RELEASE
- # QT_QTDBUS_LIBRARY_DEBUG
- #
- # The QtDesigner library: QT_QTDESIGNER_LIBRARY
- # QT_QTDESIGNER_LIBRARY_RELEASE
- # QT_QTDESIGNER_LIBRARY_DEBUG
- #
- # The QtDesignerComponents library: QT_QTDESIGNERCOMPONENTS_LIBRARY
- # QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE
- # QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG
- #
- # The QtGui library: QT_QTGUI_LIBRARY
- # QT_QTGUI_LIBRARY_RELEASE
- # QT_QTGUI_LIBRARY_DEBUG
- #
- # The QtMotif library: QT_QTMOTIF_LIBRARY
- # QT_QTMOTIF_LIBRARY_RELEASE
- # QT_QTMOTIF_LIBRARY_DEBUG
- #
- # The QtNetwork library: QT_QTNETWORK_LIBRARY
- # QT_QTNETWORK_LIBRARY_RELEASE
- # QT_QTNETWORK_LIBRARY_DEBUG
- #
- # The QtNsPLugin library: QT_QTNSPLUGIN_LIBRARY
- # QT_QTNSPLUGIN_LIBRARY_RELEASE
- # QT_QTNSPLUGIN_LIBRARY_DEBUG
#
! # The QtOpenGL library: QT_QTOPENGL_LIBRARY
! # QT_QTOPENGL_LIBRARY_RELEASE
! # QT_QTOPENGL_LIBRARY_DEBUG
! #
! # The QtSql library: QT_QTSQL_LIBRARY
! # QT_QTSQL_LIBRARY_RELEASE
! # QT_QTSQL_LIBRARY_DEBUG
! #
! # The QtXml library: QT_QTXML_LIBRARY
! # QT_QTXML_LIBRARY_RELEASE
! # QT_QTXML_LIBRARY_DEBUG
! #
! # The QtSvg library: QT_QTSVG_LIBRARY
! # QT_QTSVG_LIBRARY_RELEASE
! # QT_QTSVG_LIBRARY_DEBUG
! #
! # The QtScript library: QT_QTSCRIPT_LIBRARY
! # QT_QTSCRIPT_LIBRARY_RELEASE
! # QT_QTSCRIPT_LIBRARY_DEBUG
! #
! # The QtTest library: QT_QTTEST_LIBRARY
! # QT_QTTEST_LIBRARY_RELEASE
! # QT_QTTEST_LIBRARY_DEBUG
! #
! # The qtmain library for Windows QT_QTMAIN_LIBRARY
! # QT_QTMAIN_LIBRARY_RELEASE
! # QT_QTMAIN_LIBRARY_DEBUG
#
! # The QtUiTools library: QT_QTUITOOLS_LIBRARY
! # QT_QTUITOOLS_LIBRARY_RELEASE
! # QT_QTUITOOLS_LIBRARY_DEBUG
#
# also defined, but NOT for general use are
--- 157,186 ----
# QT_PLUGINS_DIR Path to "plugins" for Qt4
#
#
! # 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
! # QT_QTASSISTANT_LIBRARY The QtAssistant library
! # QT_QTCORE_LIBRARY The QtCore library
! # QT_QTDBUS_LIBRARY The QtDBus library
! # QT_QTDESIGNER_LIBRARY The QtDesigner library
! # QT_QTDESIGNERCOMPONENTS_LIBRARY The QtDesignerComponents library
! # QT_QTGUI_LIBRARY The QtGui library
! # QT_QTMOTIF_LIBRARY The QtMotif library
! # QT_QTNETWORK_LIBRARY The QtNetwork library
! # QT_QTNSPLUGIN_LIBRARY The QtNsPLugin library
! # QT_QTOPENGL_LIBRARY The QtOpenGL library
! # QT_QTSQL_LIBRARY The QtSql library
! # QT_QTXML_LIBRARY The QtXml library
! # QT_QTSVG_LIBRARY The QtSvg library
! # QT_QTSCRIPT_LIBRARY The QtScript library
! # QT_QTTEST_LIBRARY The QtTest library
! # QT_QTMAIN_LIBRARY The qtmain library for Windows
! # QT_QTUITOOLS_LIBRARY The QtUiTools library
! # QT_QTASSISTANTCLIENT_LIBRARY The QtAssistantClient library
! # QT_QTHELP_LIBRARY The QtHelp library
! # QT_QTWEBKIT_LIBRARY The QtWebKit library
! # QT_QTXMLPATTERNS_LIBRARY The QtXmlPatterns library
#
# also defined, but NOT for general use are
***************
*** 547,555 ****
)
-
-
# Set QT_QTMOTIF_INCLUDE_DIR
IF(Q_WS_X11)
! FIND_PATH(QT_QTMOTIF_INCLUDE_DIR QtMotif PATHS ${QT_INCLUDE_DIR}/QtMotif NO_DEFAULT_PATH )
ENDIF(Q_WS_X11)
--- 509,518 ----
)
# Set QT_QTMOTIF_INCLUDE_DIR
IF(Q_WS_X11)
! FIND_PATH(QT_QTMOTIF_INCLUDE_DIR QtMotif
! PATHS
! ${QT_INCLUDE_DIR}/QtMotif
! NO_DEFAULT_PATH )
ENDIF(Q_WS_X11)
***************
*** 598,602 ****
PATHS
${QT_INCLUDE_DIR}/QtAssistant
- ${QT_HEADERS_DIR}/QtAssistant
${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
NO_DEFAULT_PATH
--- 561,564 ----
***************
*** 607,611 ****
PATHS
${QT_INCLUDE_DIR}/QtDesigner
- ${QT_HEADERS_DIR}/QtDesigner
${QT_LIBRARY_DIR}/QtDesigner.framework/Headers
NO_DEFAULT_PATH
--- 569,572 ----
***************
*** 616,629 ****
PATHS
${QT_INCLUDE_DIR}/QtDesigner
! ${QT_HEADERS_DIR}/QtDesigner
NO_DEFAULT_PATH
)
-
# Set QT_QTDBUS_INCLUDE_DIR
FIND_PATH(QT_QTDBUS_INCLUDE_DIR QtDBus
PATHS
${QT_INCLUDE_DIR}/QtDBus
! ${QT_HEADERS_DIR}/QtDBus
NO_DEFAULT_PATH
)
--- 577,620 ----
PATHS
${QT_INCLUDE_DIR}/QtDesigner
! ${QT_LIBRARY_DIR}/QtDesigner.framework/Headers
NO_DEFAULT_PATH
)
# Set QT_QTDBUS_INCLUDE_DIR
FIND_PATH(QT_QTDBUS_INCLUDE_DIR QtDBus
PATHS
${QT_INCLUDE_DIR}/QtDBus
! NO_DEFAULT_PATH
! )
!
! # Set QT_QTASSISTANTCLIENT_INCLUDE_DIR
! FIND_PATH(QT_QTASSISTANTCLIENT_INCLUDE_DIR QtAssistantClient
! PATHS
! ${QT_INCLUDE_DIR}/QtAssistant
! ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
! NO_DEFAULT_PATH
! )
!
! # Set QT_QTHELP_INCLUDE_DIR
! FIND_PATH(QT_QTHELP_INCLUDE_DIR QtHelp
! PATHS
! ${QT_INCLUDE_DIR}/QtHelp
! ${QT_LIBRARY_DIR}/QtHelp.framework/Headers
! NO_DEFAULT_PATH
! )
!
! # Set QT_QTWEBKIT_INCLUDE_DIR
! FIND_PATH(QT_QTWEBKIT_INCLUDE_DIR QtWebKit
! PATHS
! ${QT_INCLUDE_DIR}/QtWebKit
! ${QT_LIBRARY_DIR}/QtWebKit.framework/Headers
! NO_DEFAULT_PATH
! )
!
! # Set QT_QTXMLPATTERNS_INCLUDE_DIR
! FIND_PATH(QT_QTXMLPATTERNS_INCLUDE_DIR QtXmlPatterns
! PATHS
! ${QT_INCLUDE_DIR}/QtXmlPatterns
! ${QT_LIBRARY_DIR}/QtXmlPatterns.framework/Headers
NO_DEFAULT_PATH
)
***************
*** 633,637 ****
# Set QT_INCLUDES
! SET( QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default )
# Set QT_QTCORE_LIBRARY by searching for a lib with "QtCore." as part of the filename
--- 624,628 ----
# Set QT_INCLUDES
! SET( QT_INCLUDES ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR} )
# Set QT_QTCORE_LIBRARY by searching for a lib with "QtCore." as part of the filename
***************
*** 715,719 ****
# Set QT_QTDESIGNERCOMPONENTS_LIBRARY
FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NAMES QtDesignerComponents QtDesignerComponents4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
! FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG NAMES QtDesigner_debug QtDesignerd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
# Set QT_QTMAIN_LIBRARY
--- 706,710 ----
# Set QT_QTDESIGNERCOMPONENTS_LIBRARY
FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NAMES QtDesignerComponents QtDesignerComponents4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
! FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG NAMES QtDesignerComponents_debug QtDesignerComponentsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
# Set QT_QTMAIN_LIBRARY
***************
*** 724,727 ****
--- 715,734 ----
NO_DEFAULT_PATH)
ENDIF(WIN32)
+
+ # Set QT_QTASSISTANTCLIENT_LIBRARY
+ FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NAMES QtAssistantClient QtAssistantClient4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_DEBUG NAMES QtAssistantClient_debug QtAssistantClientd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+ # Set QT_QTHELP_LIBRARY
+ FIND_LIBRARY(QT_QTHELP_LIBRARY_RELEASE NAMES QtHelp QtHelp4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_QTHELP_LIBRARY_DEBUG NAMES QtHelp_debug QtHelpd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+ # Set QT_QTWEBKIT_LIBRARY
+ FIND_LIBRARY(QT_QTWEBKIT_LIBRARY_RELEASE NAMES QtWebKit QtWebKit4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_QTWEBKIT_LIBRARY_DEBUG NAMES QtWebKit_debug QtWebKitd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+ # Set QT_QTXMLPATTERNS_LIBRARY
+ 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)
############################################
***************
*** 771,775 ****
IF (QT_${basename}_INCLUDE_DIR)
#add the include directory to QT_INCLUDES
! SET(QT_INCLUDES ${QT_INCLUDES} "${QT_${basename}_INCLUDE_DIR}")
ENDIF (QT_${basename}_INCLUDE_DIR)
--- 778,782 ----
IF (QT_${basename}_INCLUDE_DIR)
#add the include directory to QT_INCLUDES
! SET(QT_INCLUDES "${QT_${basename}_INCLUDE_DIR}" ${QT_INCLUDES})
ENDIF (QT_${basename}_INCLUDE_DIR)
***************
*** 797,800 ****
--- 804,811 ----
_QT4_ADJUST_LIB_VARS(QTTEST)
_QT4_ADJUST_LIB_VARS(QTDBUS)
+ _QT4_ADJUST_LIB_VARS(QTASSISTANTCLIENT)
+ _QT4_ADJUST_LIB_VARS(QTHELP)
+ _QT4_ADJUST_LIB_VARS(QTWEBKIT)
+ _QT4_ADJUST_LIB_VARS(QTXMLPATTERNS)
# platform dependent libraries
More information about the Cmake-commits
mailing list