ngompa / rpms / cmake

Forked from rpms/cmake 4 years ago
Clone
Blob Blame History Raw
diff -up cmake-2.8.12/Modules/UseQt4.cmake.qtdeps cmake-2.8.12/Modules/UseQt4.cmake
--- cmake-2.8.12/Modules/UseQt4.cmake.qtdeps	2013-10-07 09:31:00.000000000 -0600
+++ cmake-2.8.12/Modules/UseQt4.cmake	2013-10-23 10:39:14.763568925 -0600
@@ -56,39 +56,13 @@ if (QT_USE_QT3SUPPORT)
   add_definitions(-DQT3_SUPPORT)
 endif ()
 
-# 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)
-set(QT_QTUITOOLS_MODULE_DEPENDS QTGUI QTXML QTCORE)
-set(QT_QTHELP_MODULE_DEPENDS QTGUI QTSQL QTXML QTNETWORK QTCORE)
-if(QT_QTDBUS_FOUND)
-  set(QT_PHONON_MODULE_DEPENDS QTGUI QTDBUS QTCORE)
-else()
-  set(QT_PHONON_MODULE_DEPENDS QTGUI QTCORE)
-endif()
-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)
-set(QT_QTSCRIPTTOOLS_MODULE_DEPENDS QTGUI QTCORE)
-set(QT_QTWEBKIT_MODULE_DEPENDS QTXMLPATTERNS QTGUI QTCORE)
-set(QT_QTDECLARATIVE_MODULE_DEPENDS QTSCRIPT QTSVG QTSQL QTXMLPATTERNS QTGUI QTCORE)
-set(QT_QTMULTIMEDIA_MODULE_DEPENDS QTGUI QTCORE)
-set(QT_QTOPENGL_MODULE_DEPENDS QTGUI QTCORE)
-set(QT_QTSCRIPT_MODULE_DEPENDS QTCORE)
-set(QT_QTGUI_MODULE_DEPENDS QTCORE)
-set(QT_QTTEST_MODULE_DEPENDS QTCORE)
-set(QT_QTXML_MODULE_DEPENDS QTCORE)
-set(QT_QTSQL_MODULE_DEPENDS QTCORE)
-set(QT_QTNETWORK_MODULE_DEPENDS QTCORE)
-
 # Qt modules  (in order of dependence)
 foreach(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN
                QAXSERVER QAXCONTAINER QTDECLARATIVE QTSCRIPT QTSVG QTUITOOLS QTHELP
                QTWEBKIT PHONON QTSCRIPTTOOLS QTMULTIMEDIA QTXMLPATTERNS QTGUI QTTEST
                QTDBUS QTXML QTSQL QTNETWORK QTCORE)
 
-  if (QT_USE_${module} OR QT_USE_${module}_DEPENDS)
+  if (QT_USE_${module})
     if (QT_${module}_FOUND)
       if(QT_USE_${module})
         string(REPLACE "QT" "" qt_module_def "${module}")
@@ -104,9 +78,6 @@ foreach(module QT3SUPPORT QTOPENGL QTASS
       if(QT_IS_STATIC)
         set(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIB_DEPENDENCIES})
       endif()
-      foreach(depend_module ${QT_${module}_MODULE_DEPENDS})
-        set(QT_USE_${depend_module}_DEPENDS 1)
-      endforeach()
     else ()
       message("Qt ${module} library not found.")
     endif ()