[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.146 1.147 UseQt4.cmake 1.19 1.20

[cmake-commits at cmake.org]

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

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

ENH:  Add support for building with Qt's ActiveX support on Windows.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.146
retrieving revision 1.147
diff -C 2 -d -r1.146 -r1.147
*** FindQt4.cmake	29 Jan 2009 18:26:01 -0000	1.146
--- FindQt4.cmake	6 Feb 2009 04:01:37 -0000	1.147
***************
*** 12,15 ****
--- 12,17 ----
  #                    QT_USE_QT3SUPPORT
  #                    QT_USE_QTASSISTANT
+ #                    QT_USE_QAXCONTAINER
+ #                    QT_USE_QAXSERVER
  #                    QT_USE_QTDESIGNER
  #                    QT_USE_QTMOTIF
***************
*** 140,143 ****
--- 142,147 ----
  #  QT_QT3SUPPORT_FOUND      True if Qt3Support was found.
  #  QT_QTASSISTANT_FOUND     True if QtAssistant was found.
+ #  QT_QAXCONTAINER_FOUND     True if QAxContainer was found (Windows only).
+ #  QT_QAXSERVER_FOUND          True if QAxServer was found (Windows only).
  #  QT_QTDBUS_FOUND          True if QtDBus was found.
  #  QT_QTDESIGNER_FOUND      True if QtDesigner was found.
***************
*** 180,183 ****
--- 184,189 ----
  #  QT_QT3SUPPORT_INCLUDE_DIR   Path to "include/Qt3Support" 
  #  QT_QTASSISTANT_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)
  #  QT_QTCORE_INCLUDE_DIR       Path to "include/QtCore"         
  #  QT_QTDESIGNER_INCLUDE_DIR   Path to "include/QtDesigner" 
***************
*** 215,218 ****
--- 221,226 ----
  #  QT_QT3SUPPORT_LIBRARY            The Qt3Support library
  #  QT_QTASSISTANT_LIBRARY           The QtAssistant library
+ #  QT_QAXCONTAINER_LIBRARY           The QAxContainer library (Windows only)
+ #  QT_QAXSERVER_LIBRARY                The QAxServer library (Windows only)
  #  QT_QTCORE_LIBRARY                The QtCore library
  #  QT_QTDBUS_LIBRARY                The QtDBus library
***************
*** 513,516 ****
--- 521,530 ----
      SET(QT_QTCLUCENE_LIBRARY_RELEASE NOTFOUND)
      SET(QT_QTCLUCENE_LIBRARY_DEBUG NOTFOUND)
+     SET(QT_QAXCONTAINER_INCLUDE_DIR NOTFOUND)
+     SET(QT_QAXCONTAINER_LIBRARY_RELEASE NOTFOUND)
+     SET(QT_QAXCONTAINER_LIBRARY_DEBUG NOTFOUND)
+     SET(QT_QAXSERVER_INCLUDE_DIR NOTFOUND)
+     SET(QT_QAXSERVER_LIBRARY_RELEASE NOTFOUND)
+     SET(QT_QAXSERVER_LIBRARY_DEBUG NOTFOUND)
    ENDIF(QT_QMAKE_CHANGED)
  
***************
*** 525,528 ****
--- 539,557 ----
    ENDFOREACH(QT_MODULE)
    
+   IF(WIN32)
+     SET(QT_MODULES ${QT_MODULES} QAxContainer QAxServer)
+     # Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR
+     FIND_PATH(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt
+       PATHS
+       ${QT_HEADERS_DIR}/ActiveQt
+       NO_DEFAULT_PATH
+       )
+     FIND_PATH(QT_QAXSERVER_INCLUDE_DIR ActiveQt
+       PATHS
+       ${QT_HEADERS_DIR}/ActiveQt
+       NO_DEFAULT_PATH
+       )
+   ENDIF(WIN32)
+   
    # Set QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR
    FIND_PATH(QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR QDesignerComponents
***************
*** 757,760 ****
--- 786,791 ----
    IF(WIN32)
      _QT4_ADJUST_LIB_VARS(QTMAIN)
+     _QT4_ADJUST_LIB_VARS(QAXSERVER)
+     _QT4_ADJUST_LIB_VARS(QAXCONTAINER)
    ENDIF(WIN32)
    

Index: UseQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UseQt4.cmake,v
retrieving revision 1.19
retrieving revision 1.20
diff -C 2 -d -r1.19 -r1.20
*** UseQt4.cmake	28 Jan 2009 20:04:52 -0000	1.19
--- UseQt4.cmake	6 Feb 2009 04:01:38 -0000	1.20
***************
*** 52,60 ****
  SET(QT_QTDBUS_MODULE_DEPENDS QTXML QTCORE)
  SET(QT_QTXMLPATTERNS_MODULE_DEPENDS QTNETWORK QTCORE)
  
  # Qt modules  (in order of dependence)
  FOREACH(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN
!                QTSCRIPT QTSVG QTUITOOLS QTHELP QTWEBKIT PHONON QTGUI QTTEST 
!                QTDBUS QTXML QTSQL QTXMLPATTERNS QTNETWORK QTCORE)
  
    IF (QT_USE_${module} OR QT_USE_${module}_DEPENDS)
--- 52,63 ----
  SET(QT_QTDBUS_MODULE_DEPENDS QTXML QTCORE)
  SET(QT_QTXMLPATTERNS_MODULE_DEPENDS QTNETWORK QTCORE)
+ SET(QT_QAXCONTAINER_MODULE_DEPENDS QTGUI QTCORE)
+ SET(QT_QAXSERVER_MODULE_DEPENDS QTGUI QTCORE)
  
  # Qt modules  (in order of dependence)
  FOREACH(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN
!                QAXSERVER QAXCONTAINER QTSCRIPT QTSVG QTUITOOLS QTHELP 
!                QTWEBKIT PHONON QTGUI QTTEST QTDBUS QTXML QTSQL QTXMLPATTERNS 
!                QTNETWORK QTCORE)
  
    IF (QT_USE_${module} OR QT_USE_${module}_DEPENDS)