[Cmake-commits] [cmake-commits] king committed FindQt4.cmake 1.166.2.2 1.166.2.3
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Nov 10 09:03:41 EST 2009
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv8948/Modules
Modified Files:
Tag: CMake-2-8
FindQt4.cmake
Log Message:
CMake 2.8.0-rc6
Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.166.2.2
retrieving revision 1.166.2.3
diff -C 2 -d -r1.166.2.2 -r1.166.2.3
*** FindQt4.cmake 9 Oct 2009 20:11:11 -0000 1.166.2.2
--- FindQt4.cmake 10 Nov 2009 14:03:36 -0000 1.166.2.3
***************
*** 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
***************
*** 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,662 ----
NO_DEFAULT_PATH
)
!
# Set QT_INCLUDE_DIR by removine "/QtCore" in the string ${QT_QTCORE_INCLUDE_DIR}
IF( QT_QTCORE_INCLUDE_DIR )
***************
*** 671,676 ****
# 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
--- 676,680 ----
# Make variables changeble to the advanced user
! MARK_AS_ADVANCED( QT_INCLUDE_DIR )
# Set QT_INCLUDES
***************
*** 736,741 ****
ENDIF("${QT_EDITION}" MATCHES "DesktopLight")
!
!
# find the libraries
--- 740,748 ----
ENDIF("${QT_EDITION}" MATCHES "DesktopLight")
! ########################################
! #
! # Setting the LIBRARY-Variables
! #
! ########################################
# find the libraries
***************
*** 1169,1175 ****
SET(_impl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc)
!
ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
! COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} -m -p ${_basename} ${_infile}
DEPENDS ${_infile})
--- 1176,1186 ----
SET(_impl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc)
!
! # handling more arguments (as in FindQt4.cmake from KDE4) will come soon, then
! # _params will be used for more than just -m
! SET(_params -m)
!
ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
! COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} ${_params} -p ${_basename} ${_infile}
DEPENDS ${_infile})
More information about the Cmake-commits
mailing list