[Cmake-commits] [cmake-commits] alex committed FindQt4.cmake 1.175 1.176
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Nov 9 12:55:49 EST 2009
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv28672
Modified Files:
FindQt4.cmake
Log Message:
Sort documentation entries better and move mark_as_advanced() a bit back
Alex
Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.175
retrieving revision 1.176
diff -C 2 -d -r1.175 -r1.176
*** FindQt4.cmake 8 Nov 2009 18:21:09 -0000 1.175
--- FindQt4.cmake 9 Nov 2009 17:55:46 -0000 1.176
***************
*** 198,201 ****
--- 198,202 ----
# QT_QT3SUPPORT_INCLUDE_DIR Path to "include/Qt3Support"
# QT_QTASSISTANT_INCLUDE_DIR Path to "include/QtAssistant"
+ # QT_QTASSISTANTCLIENT_INCLUDE_DIR Path to "include/QtAssistant"
# QT_QAXCONTAINER_INCLUDE_DIR Path to "include/ActiveQt" (Windows only)
# QT_QAXSERVER_INCLUDE_DIR Path to "include/ActiveQt" (Windows only)
***************
*** 205,220 ****
# QT_QTDBUS_INCLUDE_DIR Path to "include/QtDBus"
# QT_QTGUI_INCLUDE_DIR Path to "include/QtGui"
# QT_QTMOTIF_INCLUDE_DIR Path to "include/QtMotif"
# QT_QTNETWORK_INCLUDE_DIR Path to "include/QtNetwork"
# QT_QTNSPLUGIN_INCLUDE_DIR Path to "include/QtNsPlugin"
# QT_QTOPENGL_INCLUDE_DIR Path to "include/QtOpenGL"
# QT_QTSQL_INCLUDE_DIR Path to "include/QtSql"
- # QT_QTXML_INCLUDE_DIR Path to "include/QtXml"
# QT_QTSVG_INCLUDE_DIR Path to "include/QtSvg"
- # 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_PHONON_INCLUDE_DIR Path to "include/phonon"
--- 206,220 ----
# QT_QTDBUS_INCLUDE_DIR Path to "include/QtDBus"
# QT_QTGUI_INCLUDE_DIR Path to "include/QtGui"
+ # QT_QTHELP_INCLUDE_DIR Path to "include/QtHelp"
# QT_QTMOTIF_INCLUDE_DIR Path to "include/QtMotif"
# QT_QTNETWORK_INCLUDE_DIR Path to "include/QtNetwork"
# QT_QTNSPLUGIN_INCLUDE_DIR Path to "include/QtNsPlugin"
# QT_QTOPENGL_INCLUDE_DIR Path to "include/QtOpenGL"
+ # QT_QTSCRIPT_INCLUDE_DIR Path to "include/QtScript"
# QT_QTSQL_INCLUDE_DIR Path to "include/QtSql"
# QT_QTSVG_INCLUDE_DIR Path to "include/QtSvg"
# QT_QTTEST_INCLUDE_DIR Path to "include/QtTest"
# QT_QTWEBKIT_INCLUDE_DIR Path to "include/QtWebKit"
+ # QT_QTXML_INCLUDE_DIR Path to "include/QtXml"
# QT_QTXMLPATTERNS_INCLUDE_DIR Path to "include/QtXmlPatterns"
# QT_PHONON_INCLUDE_DIR Path to "include/phonon"
***************
*** 236,239 ****
--- 236,240 ----
# QT_QT3SUPPORT_LIBRARY The Qt3Support library
# QT_QTASSISTANT_LIBRARY The QtAssistant library
+ # QT_QTASSISTANTCLIENT_LIBRARY The QtAssistantClient library
# QT_QAXCONTAINER_LIBRARY The QAxContainer library (Windows only)
# QT_QAXSERVER_LIBRARY The QAxServer library (Windows only)
***************
*** 243,261 ****
# 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
# QT_PHONON_LIBRARY The phonon library
# QT_QTSCRIPTTOOLS_LIBRARY The QtScriptTools library
--- 244,261 ----
# QT_QTDESIGNERCOMPONENTS_LIBRARY The QtDesignerComponents library
# QT_QTGUI_LIBRARY The QtGui library
+ # QT_QTHELP_LIBRARY The QtHelp 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_QTSCRIPT_LIBRARY The QtScript library
# QT_QTSQL_LIBRARY The QtSql library
# QT_QTSVG_LIBRARY The QtSvg library
# QT_QTTEST_LIBRARY The QtTest library
# QT_QTUITOOLS_LIBRARY The QtUiTools library
# QT_QTWEBKIT_LIBRARY The QtWebKit library
+ # QT_QTXML_LIBRARY The QtXml library
# QT_QTXMLPATTERNS_LIBRARY The QtXmlPatterns library
+ # QT_QTMAIN_LIBRARY The qtmain library for Windows
# QT_PHONON_LIBRARY The phonon library
# QT_QTSCRIPTTOOLS_LIBRARY The QtScriptTools library
***************
*** 659,665 ****
)
- # 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 )
--- 659,662 ----
***************
*** 678,681 ****
--- 675,681 ----
ENDIF( NOT QT_INCLUDE_DIR)
+ # Make variables changeble to the advanced user
+ MARK_AS_ADVANCED( QT_INCLUDE_DIR )
+
# Set QT_INCLUDES
SET( QT_INCLUDES ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR} )
More information about the Cmake-commits
mailing list