|
 |
949600 |
diff -up cmake-2.8.12/Modules/UseQt4.cmake.qtdeps cmake-2.8.12/Modules/UseQt4.cmake
|
|
|
949600 |
--- cmake-2.8.12/Modules/UseQt4.cmake.qtdeps 2013-10-07 09:31:00.000000000 -0600
|
|
|
949600 |
+++ cmake-2.8.12/Modules/UseQt4.cmake 2013-10-23 10:39:14.763568925 -0600
|
|
|
949600 |
@@ -56,39 +56,13 @@ if (QT_USE_QT3SUPPORT)
|
|
|
949600 |
add_definitions(-DQT3_SUPPORT)
|
|
|
949600 |
endif ()
|
|
|
949600 |
|
|
|
949600 |
-# list dependent modules, so dependent libraries are added
|
|
|
949600 |
-set(QT_QT3SUPPORT_MODULE_DEPENDS QTGUI QTSQL QTXML QTNETWORK QTCORE)
|
|
|
949600 |
-set(QT_QTSVG_MODULE_DEPENDS QTGUI QTXML QTCORE)
|
|
|
949600 |
-set(QT_QTUITOOLS_MODULE_DEPENDS QTGUI QTXML QTCORE)
|
|
|
949600 |
-set(QT_QTHELP_MODULE_DEPENDS QTGUI QTSQL QTXML QTNETWORK QTCORE)
|
|
|
949600 |
-if(QT_QTDBUS_FOUND)
|
|
|
949600 |
- set(QT_PHONON_MODULE_DEPENDS QTGUI QTDBUS QTCORE)
|
|
|
949600 |
-else()
|
|
|
949600 |
- set(QT_PHONON_MODULE_DEPENDS QTGUI QTCORE)
|
|
|
949600 |
-endif()
|
|
|
949600 |
-set(QT_QTDBUS_MODULE_DEPENDS QTXML QTCORE)
|
|
|
949600 |
-set(QT_QTXMLPATTERNS_MODULE_DEPENDS QTNETWORK QTCORE)
|
|
|
949600 |
-set(QT_QAXCONTAINER_MODULE_DEPENDS QTGUI QTCORE)
|
|
|
949600 |
-set(QT_QAXSERVER_MODULE_DEPENDS QTGUI QTCORE)
|
|
|
949600 |
-set(QT_QTSCRIPTTOOLS_MODULE_DEPENDS QTGUI QTCORE)
|
|
|
949600 |
-set(QT_QTWEBKIT_MODULE_DEPENDS QTXMLPATTERNS QTGUI QTCORE)
|
|
|
949600 |
-set(QT_QTDECLARATIVE_MODULE_DEPENDS QTSCRIPT QTSVG QTSQL QTXMLPATTERNS QTGUI QTCORE)
|
|
|
949600 |
-set(QT_QTMULTIMEDIA_MODULE_DEPENDS QTGUI QTCORE)
|
|
|
949600 |
-set(QT_QTOPENGL_MODULE_DEPENDS QTGUI QTCORE)
|
|
|
949600 |
-set(QT_QTSCRIPT_MODULE_DEPENDS QTCORE)
|
|
|
949600 |
-set(QT_QTGUI_MODULE_DEPENDS QTCORE)
|
|
|
949600 |
-set(QT_QTTEST_MODULE_DEPENDS QTCORE)
|
|
|
949600 |
-set(QT_QTXML_MODULE_DEPENDS QTCORE)
|
|
|
949600 |
-set(QT_QTSQL_MODULE_DEPENDS QTCORE)
|
|
|
949600 |
-set(QT_QTNETWORK_MODULE_DEPENDS QTCORE)
|
|
|
949600 |
-
|
|
|
949600 |
# Qt modules (in order of dependence)
|
|
|
949600 |
foreach(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN
|
|
|
949600 |
QAXSERVER QAXCONTAINER QTDECLARATIVE QTSCRIPT QTSVG QTUITOOLS QTHELP
|
|
|
949600 |
QTWEBKIT PHONON QTSCRIPTTOOLS QTMULTIMEDIA QTXMLPATTERNS QTGUI QTTEST
|
|
|
949600 |
QTDBUS QTXML QTSQL QTNETWORK QTCORE)
|
|
|
949600 |
|
|
|
949600 |
- if (QT_USE_${module} OR QT_USE_${module}_DEPENDS)
|
|
|
949600 |
+ if (QT_USE_${module})
|
|
|
949600 |
if (QT_${module}_FOUND)
|
|
|
949600 |
if(QT_USE_${module})
|
|
|
949600 |
string(REPLACE "QT" "" qt_module_def "${module}")
|
|
|
949600 |
@@ -104,9 +78,6 @@ foreach(module QT3SUPPORT QTOPENGL QTASS
|
|
|
949600 |
if(QT_IS_STATIC)
|
|
|
949600 |
set(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIB_DEPENDENCIES})
|
|
|
949600 |
endif()
|
|
|
949600 |
- foreach(depend_module ${QT_${module}_MODULE_DEPENDS})
|
|
|
949600 |
- set(QT_USE_${depend_module}_DEPENDS 1)
|
|
|
949600 |
- endforeach()
|
|
|
949600 |
else ()
|
|
|
949600 |
message("Qt ${module} library not found.")
|
|
|
949600 |
endif ()
|