[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1788-gd0bf34f

[Clinton Stimpson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  d0bf34f9b275f621f0b7db537aebeebce00b9494 (commit)
       via  b94ecab6d6540512df5e7c11deb9d168566d346f (commit)
      from  8d71c7efd29d606ad11078df7e7d74de4558955e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0bf34f9b275f621f0b7db537aebeebce00b9494
commit d0bf34f9b275f621f0b7db537aebeebce00b9494
Merge: 8d71c7e b94ecab
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Feb 26 13:02:51 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 26 13:02:51 2014 -0500

    Merge topic 'qt4-overlink' into next
    
    b94ecab6 FindQt4: prevent overlinking when using UseQt4.cmake.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b94ecab6d6540512df5e7c11deb9d168566d346f
commit b94ecab6d6540512df5e7c11deb9d168566d346f
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Feb 26 10:53:53 2014 -0700
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Wed Feb 26 10:55:38 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})
       if(QT_IS_STATIC)
         set(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${module}_LIB_DEPENDENCIES})

-----------------------------------------------------------------------

Summary of changes:
 Modules/UseQt4.cmake |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake