[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3360-gb735844

[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  b73584429405d585be416d7cf0257844fc8e0047 (commit)
       via  0f267c012b83f248d4d300dba4bd42152227b4e4 (commit)
      from  4d81237b98a6e78a14b8731e97370377a59cc29e (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=b73584429405d585be416d7cf0257844fc8e0047
commit b73584429405d585be416d7cf0257844fc8e0047
Merge: 4d81237 0f267c0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jul 25 07:59:03 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 25 07:59:03 2013 -0400

    Merge topic 'Qt4-INTERFACE_LINK_LIBRARIES' into next
    
    0f267c0 FindQt4: Populate the INTERFACE_LINK_LIBRARIES of IMPORTED targets.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f267c012b83f248d4d300dba4bd42152227b4e4
commit 0f267c012b83f248d4d300dba4bd42152227b4e4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jul 25 11:19:22 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jul 25 13:55:42 2013 +0200

    FindQt4: Populate the INTERFACE_LINK_LIBRARIES of IMPORTED targets.
    
    This makes the IMPORTED_LINK_INTERFACE_LIBRARIES_<CONFIG> properties
    obsolete.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 7e9caa2..55ac711 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -1012,6 +1012,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
 
   macro(_qt4_add_target_depends _QT_MODULE)
     get_target_property(_configs Qt4::${_QT_MODULE} IMPORTED_CONFIGURATIONS)
+    _qt4_add_target_depends_internal(${_QT_MODULE} INTERFACE_LINK_LIBRARIES ${ARGN})
     foreach(_config ${_configs})
       _qt4_add_target_depends_internal(${_QT_MODULE} IMPORTED_LINK_INTERFACE_LIBRARIES_${_config} ${ARGN})
     endforeach()
@@ -1116,6 +1117,10 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
     set(_isNotExcluded $<NOT:$<BOOL:$<TARGET_PROPERTY:QT4_NO_LINK_QTMAIN>>>)
     set(_isPolicyNEW $<TARGET_POLICY:CMP0020>)
     get_target_property(_configs Qt4::QtCore IMPORTED_CONFIGURATIONS)
+    set_property(TARGET Qt4::QtCore APPEND PROPERTY
+        INTERFACE_LINK_LIBRARIES
+          $<$<AND:${_isExe},${_isWin32},${_isNotExcluded},${_isPolicyNEW}>:Qt4::qtmain>
+    )
     foreach(_config ${_configs})
       set_property(TARGET Qt4::QtCore APPEND PROPERTY
         IMPORTED_LINK_INTERFACE_LIBRARIES_${_config}

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

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


hooks/post-receive
-- 
CMake