2014-02-28 21:48:52 +00:00
|
|
|
commit b94ecab6d6540512df5e7c11deb9d168566d346f
|
|
|
|
|
Author: Clinton Stimpson <clinton@elemtech.com>
|
|
|
|
|
Date: Wed Feb 26 10:53:53 2014 -0700
|
|
|
|
|
|
|
|
|
|
FindQt4: prevent overlinking when using UseQt4.cmake.
|
|
|
|
|
|
|
|
|
|
Now it only links with the Qt libraries specified by the user,
|
|
|
|
|
instead of automatically including all dependencies.
|
|
|
|
|
Fixes #14750 and thanks to Orion Poplawski.
|
|
|
|
|
|
|
|
|
|
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})
|
2013-10-23 17:09:46 +00:00
|
|
|
if(QT_IS_STATIC)
|
|
|
|
|
set(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIB_DEPENDENCIES})
|
