[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1343-g1a027de

[Stephen Kelly]

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  1a027de1bf0712f9228f398ce33386afa21cd7de (commit)
       via  70ec72c23213209403fc32791d187c1858e1714f (commit)
      from  c4fa2b86feff17cb2e3702f5b43f153a80259a77 (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=1a027de1bf0712f9228f398ce33386afa21cd7de
commit 1a027de1bf0712f9228f398ce33386afa21cd7de
Merge: c4fa2b8 70ec72c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 2 11:19:42 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 2 11:19:42 2013 -0500

    Merge topic 'qt4-target-depends' into next
    
    70ec72c Populate the IMPORTED_LINK_DEPENDENT_LIBRARIES for Qt 4 targets.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70ec72c23213209403fc32791d187c1858e1714f
commit 70ec72c23213209403fc32791d187c1858e1714f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 2 17:10:48 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Jan 2 17:18:49 2013 +0100

    Populate the IMPORTED_LINK_DEPENDENT_LIBRARIES for Qt 4 targets.
    
    Perhaps this will fix the errors reported with the LSB platforms.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 4a176e5..381141c 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -942,20 +942,29 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
   ############################################
 
 
-  macro(_qt4_add_target_depends _QT_MODULE)
+  macro(_qt4_add_target_depends_internal _QT_MODULE _PROPERTY)
     if (TARGET Qt4::${_QT_MODULE})
       foreach(_DEPEND ${ARGN})
         if (NOT TARGET Qt4::Qt${_DEPEND})
           message(FATAL_ERROR "_qt4_add_target_depends invoked with invalid arguments")
         endif()
         set_property(TARGET Qt4::${_QT_MODULE} APPEND PROPERTY
-          IMPORTED_LINK_INTERFACE_LIBRARIES
+          ${_PROPERTY}
           "Qt4::Qt${_DEPEND}"
         )
       endforeach()
     endif()
   endmacro()
 
+  macro(_qt4_add_target_depends _QT_MODULE)
+    _qt4_add_target_depends_internal(${_QT_MODULE} IMPORTED_LINK_INTERFACE_LIBRARIES ${ARGN})
+  endmacro()
+
+  macro(_qt4_add_target_private_depends _QT_MODULE)
+    _qt4_add_target_depends_internal(${_QT_MODULE} IMPORTED_LINK_DEPENDENT_LIBRARIES ${ARGN})
+  endmacro()
+
+
   # Set QT_xyz_LIBRARY variable and add
   # library include path to QT_INCLUDES
   _QT4_ADJUST_LIB_VARS(QtCore)
@@ -991,6 +1000,24 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
   _qt4_add_target_depends(QtSvg Gui)
   _qt4_add_target_depends(QtWebKit Gui Network)
 
+  _qt4_add_target_private_depends(Qt3Support Xml)
+  _qt4_add_target_private_depends(QtSvg Xml)
+  _qt4_add_target_private_depends(QtDBus Xml)
+  _qt4_add_target_private_depends(QtUiTools Xml Gui)
+  _qt4_add_target_private_depends(QtHelp Sql Xml Network)
+  _qt4_add_target_private_depends(QtXmlPatterns Network)
+  _qt4_add_target_private_depends(QtScriptTools Gui)
+  _qt4_add_target_private_depends(QtWebKit XmlPatterns)
+  _qt4_add_target_private_depends(QtDeclarative XmlPatterns Svg Sql Gui)
+  _qt4_add_target_private_depends(QtMultimedia Gui)
+  _qt4_add_target_private_depends(QtOpenGL Gui)
+  _qt4_add_target_private_depends(QAxServer Gui)
+  _qt4_add_target_private_depends(QAxContainer Gui)
+  _qt4_add_target_private_depends(phonon Gui)
+  if(QT_QTDBUS_FOUND)
+    _qt4_add_target_private_depends(phonon DBus)
+  endif()
+
   #######################################
   #
   #       Check the executables of Qt

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

Summary of changes:
 Modules/FindQt4.cmake |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake