[Cmake-commits] [cmake-commits] clinton committed UseQt4.cmake 1.15 1.16

[cmake-commits at cmake.org]

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

Modified Files:
	UseQt4.cmake 
Log Message:

ENH:  Similar to how qmake does it...
      Don't add compile flags for dependent modules the user didn't specify.
      But still add the link libs.  This reduces the number of
      unecessary compile flags.



Index: UseQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UseQt4.cmake,v
retrieving revision 1.15
retrieving revision 1.16
diff -C 2 -d -r1.15 -r1.16
*** UseQt4.cmake	14 Mar 2008 17:16:58 -0000	1.15
--- UseQt4.cmake	19 May 2008 22:07:00 -0000	1.16
***************
*** 37,41 ****
  ENDIF (QT_USE_QT3SUPPORT)
  
! # list dependent modules, so their modules are automatically on
  SET(QT_QT3SUPPORT_MODULE_DEPENDS QTGUI QTSQL QTXML QTNETWORK QTCORE)
  SET(QT_QTSVG_MODULE_DEPENDS QTGUI QTXML QTCORE)
--- 37,41 ----
  ENDIF (QT_USE_QT3SUPPORT)
  
! # list dependent modules, so dependent libraries are added
  SET(QT_QT3SUPPORT_MODULE_DEPENDS QTGUI QTSQL QTXML QTNETWORK QTCORE)
  SET(QT_QTSVG_MODULE_DEPENDS QTGUI QTXML QTCORE)
***************
*** 51,55 ****
                 QTDBUS QTXML QTSQL QTXMLPATTERNS QTNETWORK QTCORE)
  
!   IF (QT_USE_${module})
      IF (QT_${module}_FOUND)
        IF(QT_USE_${module})
--- 51,55 ----
                 QTDBUS QTXML QTSQL QTXMLPATTERNS QTNETWORK QTCORE)
  
!   IF (QT_USE_${module} OR QT_USE_${module}_DEPENDS)
      IF (QT_${module}_FOUND)
        IF(QT_USE_${module})
***************
*** 60,69 ****
        SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIBRARY} ${QT_${module}_LIB_DEPENDENCIES})
        FOREACH(depend_module ${QT_${module}_MODULE_DEPENDS})
!         SET(QT_USE_${depend_module} 1)
        ENDFOREACH(depend_module ${QT_${module}_MODULE_DEPENDS})
      ELSE (QT_${module}_FOUND)
        MESSAGE("Qt ${module} library not found.")
      ENDIF (QT_${module}_FOUND)
!   ENDIF (QT_USE_${module})
    
  ENDFOREACH(module)
--- 60,69 ----
        SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIBRARY} ${QT_${module}_LIB_DEPENDENCIES})
        FOREACH(depend_module ${QT_${module}_MODULE_DEPENDS})
!         SET(QT_USE_${depend_module}_DEPENDS 1)
        ENDFOREACH(depend_module ${QT_${module}_MODULE_DEPENDS})
      ELSE (QT_${module}_FOUND)
        MESSAGE("Qt ${module} library not found.")
      ENDIF (QT_${module}_FOUND)
!   ENDIF (QT_USE_${module} OR QT_USE_${module}_DEPENDS)
    
  ENDFOREACH(module)