diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2009-12-15 21:16:45 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2009-12-15 21:16:45 (GMT) |
| commit | 56ee3b43a98642b734005d230b364ffdc71d605c (patch) | |
| tree | f3ed7e20d6803fece6a0e9db57e0f3a5385eb570 /Modules/UseQt4.cmake | |
| parent | 633c2965526743e8ae4ce4202a7b17cf6562edd3 (diff) | |
| download | CMake-56ee3b43a98642b734005d230b364ffdc71d605c.zip CMake-56ee3b43a98642b734005d230b364ffdc71d605c.tar.gz CMake-56ee3b43a98642b734005d230b364ffdc71d605c.tar.bz2 | |
BUG: Fix #10021 don't specify libraries Qt depends on unless Qt is static.
Diffstat (limited to 'Modules/UseQt4.cmake')
| -rw-r--r-- | Modules/UseQt4.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/UseQt4.cmake b/Modules/UseQt4.cmake index f92500b..9192097 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}) |