[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2347-g64942b8

[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  64942b81eae8888527d6f751eb80b066d15cbe06 (commit)
       via  4d5230d1d85a910f04cd2618decc5402023d00ff (commit)
       via  793bf3fdacb3de5486e89b39824a25d29f0c8ff4 (commit)
      from  40594ad6f123ed04eacdb04ec7c8bda7b568a3cf (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=64942b81eae8888527d6f751eb80b066d15cbe06
commit 64942b81eae8888527d6f751eb80b066d15cbe06
Merge: 40594ad 4d5230d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 26 16:04:44 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 26 16:04:44 2013 -0500

    Merge topic 'non-fatal-Qt4-missing-targets' into next
    
    4d5230d Only add existing targets to the Qt4 target depends properties.
    793bf3f CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4d5230d1d85a910f04cd2618decc5402023d00ff
commit 4d5230d1d85a910f04cd2618decc5402023d00ff
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 26 22:03:04 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 26 22:03:04 2013 +0100

    Only add existing targets to the Qt4 target depends properties.
    
    Qt can be configured in ways which disable certain modules. Make
    sure we don't fail on that.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 078c031..f25e121 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -965,13 +965,17 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
   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")
+        set(_VALID_DEPENDS)
+        if (TARGET Qt4::Qt${_DEPEND})
+          list(APPEND _VALID_DEPENDS Qt4::Qt${_DEPEND})
         endif()
-        set_property(TARGET Qt4::${_QT_MODULE} APPEND PROPERTY
-          ${_PROPERTY}
-          "Qt4::Qt${_DEPEND}"
-        )
+        if (_VALID_DEPENDS)
+          set_property(TARGET Qt4::${_QT_MODULE} APPEND PROPERTY
+            ${_PROPERTY}
+            "${_VALID_DEPENDS}"
+          )
+        endif()
+        set(_VALID_DEPENDS)
       endforeach()
     endif()
   endmacro()

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

Summary of changes:
 Modules/FindQt4.cmake     |   16 ++++++++++------
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake