diff options
| author | Brad King <brad.king@kitware.com> | 2014-02-28 14:48:34 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-02-28 14:48:34 (GMT) |
| commit | 18646dd397d2c86b51118e16c62a89549bc1087d (patch) | |
| tree | db57ea2240a2d7659403c913fef1a72ed93f82fd | |
| parent | 47896189aafc011b4a726716a9c5bc433b13edd6 (diff) | |
| parent | b94ecab6d6540512df5e7c11deb9d168566d346f (diff) | |
| download | CMake-18646dd397d2c86b51118e16c62a89549bc1087d.zip CMake-18646dd397d2c86b51118e16c62a89549bc1087d.tar.gz CMake-18646dd397d2c86b51118e16c62a89549bc1087d.tar.bz2 | |
Merge topic 'qt4-overlink'
b94ecab6 FindQt4: prevent overlinking when using UseQt4.cmake.
| -rw-r--r-- | Modules/UseQt4.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/UseQt4.cmake b/Modules/UseQt4.cmake index 7478310..cba22af 100644 --- a/Modules/UseQt4.cmake +++ b/Modules/UseQt4.cmake @@ -98,7 +98,9 @@ foreach(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN include_directories(SYSTEM ${QT_${module}_INCLUDE_DIR}) endif(QT_INCLUDE_DIRS_NO_SYSTEM) endif() - set(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIBRARY}) + if(QT_USE_${module} OR QT_IS_STATIC) + set(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIBRARY}) + endif() set(QT_LIBRARIES_PLUGINS ${QT_LIBRARIES_PLUGINS} ${QT_${module}_PLUGINS}) if(QT_IS_STATIC) set(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIB_DEPENDENCIES}) |