From 56ee3b43a98642b734005d230b364ffdc71d605c Mon Sep 17 00:00:00 2001 From: Clinton Stimpson Date: Tue, 15 Dec 2009 16:16:45 -0500 Subject: BUG: Fix #10021 don't specify libraries Qt depends on unless Qt is static. --- Modules/UseQt4.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Modules/UseQt4.cmake') diff --git a/Modules/UseQt4.cmake b/Modules/UseQt4.cmake index f92500bd02..91920970f7 100644 --- a/Modules/UseQt4.cmake +++ b/Modules/UseQt4.cmake @@ -80,7 +80,10 @@ FOREACH(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN ADD_DEFINITIONS(-DQT_${qt_module_def}_LIB) INCLUDE_DIRECTORIES(${QT_${module}_INCLUDE_DIR}) ENDIF(QT_USE_${module}) - SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIBRARY} ${QT_${module}_LIB_DEPENDENCIES}) + SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIBRARY}) + IF(QT_IS_STATIC) + SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIB_DEPENDENCIES}) + ENDIF(QT_IS_STATIC) FOREACH(depend_module ${QT_${module}_MODULE_DEPENDS}) SET(QT_USE_${depend_module}_DEPENDS 1) ENDFOREACH(depend_module ${QT_${module}_MODULE_DEPENDS}) -- cgit v1.2.1