[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2051-ge472abf

[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  e472abf88fa03d1d08c91ef4ba0cb489c9859a13 (commit)
       via  ba48e63f1e68a22dd46b6c33d283190bf8aa0aed (commit)
       via  deb51a711369c9e5cce19bc3626e87273c6b5ac4 (commit)
      from  dce4d5b470f1581e8f15ef4f5d24e73297da63a5 (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=e472abf88fa03d1d08c91ef4ba0cb489c9859a13
commit e472abf88fa03d1d08c91ef4ba0cb489c9859a13
Merge: dce4d5b ba48e63
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Feb 9 04:31:29 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 9 04:31:29 2013 -0500

    Merge topic 'minor-fixes' into next
    
    ba48e63 Generate config-specific interface link libraries propeties.
    deb51a7 Remove unused forward declarations.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba48e63f1e68a22dd46b6c33d283190bf8aa0aed
commit ba48e63f1e68a22dd46b6c33d283190bf8aa0aed
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Feb 9 10:20:14 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Feb 9 10:25:35 2013 +0100

    Generate config-specific interface link libraries propeties.
    
    All other properties we generate are config-specific, so it makes
    sense to do so here too.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 35420b4..5baee01 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -985,11 +985,19 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
   endmacro()
 
   macro(_qt4_add_target_depends _QT_MODULE)
-    _qt4_add_target_depends_internal(${_QT_MODULE} IMPORTED_LINK_INTERFACE_LIBRARIES ${ARGN})
+    get_target_property(_configs Qt4::${_QT_MODULE} IMPORTED_CONFIGURATIONS)
+    foreach(_config ${_configs})
+      _qt4_add_target_depends_internal(${_QT_MODULE} IMPORTED_LINK_INTERFACE_LIBRARIES_${_config} ${ARGN})
+    endforeach()
+    set(_configs)
   endmacro()
 
   macro(_qt4_add_target_private_depends _QT_MODULE)
-    _qt4_add_target_depends_internal(${_QT_MODULE} IMPORTED_LINK_DEPENDENT_LIBRARIES ${ARGN})
+    get_target_property(_configs ${_QT_MODULE} IMPORTED_CONFIGURATIONS)
+    foreach(_config ${_configs})
+      _qt4_add_target_depends_internal(${_QT_MODULE} IMPORTED_LINK_DEPENDENT_LIBRARIES_${_config} ${ARGN})
+    endforeach()
+    set(_configs)
   endmacro()
 
 
@@ -1067,10 +1075,14 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
     set(_isWin32 $<BOOL:$<TARGET_PROPERTY:WIN32_EXECUTABLE>>)
     set(_isNotExcluded $<NOT:$<BOOL:$<TARGET_PROPERTY:QT4_NO_LINK_QTMAIN>>>)
     set(_isPolicyNEW $<TARGET_POLICY:CMP0020>)
-    set_property(TARGET Qt4::QtCore APPEND PROPERTY
-      IMPORTED_LINK_INTERFACE_LIBRARIES
-        $<$<AND:${_isExe},${_isWin32},${_isNotExcluded},${_isPolicyNEW}>:Qt4::qtmain>
-    )
+    get_target_property(_configs Qt4::QtCore IMPORTED_CONFIGURATIONS)
+    foreach(_config ${_configs})
+      set_property(TARGET Qt4::QtCore APPEND PROPERTY
+        IMPORTED_LINK_INTERFACE_LIBRARIES_${_config}
+          $<$<AND:${_isExe},${_isWin32},${_isNotExcluded},${_isPolicyNEW}>:Qt4::qtmain>
+      )
+    endforeach()
+    unset(_configs)
     unset(_isExe)
     unset(_isWin32)
     unset(_isNotExcluded)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=deb51a711369c9e5cce19bc3626e87273c6b5ac4
commit deb51a711369c9e5cce19bc3626e87273c6b5ac4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Feb 9 10:24:32 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Feb 9 10:25:05 2013 +0100

    Remove unused forward declarations.

diff --git a/Source/cmExportInstallFileGenerator.h b/Source/cmExportInstallFileGenerator.h
index 7a70431..20dd57a 100644
--- a/Source/cmExportInstallFileGenerator.h
+++ b/Source/cmExportInstallFileGenerator.h
@@ -15,10 +15,7 @@
 #include "cmExportFileGenerator.h"
 
 class cmInstallExportGenerator;
-class cmInstallFilesGenerator;
 class cmInstallTargetGenerator;
-class cmTargetExport;
-class cmExportSet;
 
 /** \class cmExportInstallFileGenerator
  * \brief Generate a file exporting targets from an install tree.

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

Summary of changes:
 Modules/FindQt4.cmake                 |   24 ++++++++++++++++++------
 Source/cmExportInstallFileGenerator.h |    3 ---
 2 files changed, 18 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake