[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7546-g677bbe8

[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  677bbe893742102be60888c3bcd0bf50cc2544d8 (commit)
       via  7d90d6c59e5a536132f420370b074970e591f595 (commit)
       via  1cc3e9f2e73b96370257b55f9c96586a898fe9a4 (commit)
      from  2cab8867b2c5940f3240d43930cb32d21a1f8ab8 (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=677bbe893742102be60888c3bcd0bf50cc2544d8
commit 677bbe893742102be60888c3bcd0bf50cc2544d8
Merge: 2cab886 7d90d6c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 9 08:39:08 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 9 08:39:08 2014 -0500

    Merge topic 'Qt4-qmake-IMPORTED' into next
    
    7d90d6c5 Qt4: Add IMPORTED executable for qmake.
    1cc3e9f2 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d90d6c59e5a536132f420370b074970e591f595
commit 7d90d6c59e5a536132f420370b074970e591f595
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 9 14:35:57 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Feb 9 14:35:57 2014 +0100

    Qt4: Add IMPORTED executable for qmake.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index e188c62..d0515c6 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -1147,6 +1147,11 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
   _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer-qt4 designer designer4)
   _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist linguist4)
 
+  if (NOT TARGET Qt4::qmake)
+    add_executable(Qt4::qmake IMPORTED)
+    set_property(TARGET Qt4::qmake PROPERTY IMPORTED_LOCATION ${QT_QMAKE_EXECUTABLE})
+  endif()
+
   if (QT_MOC_EXECUTABLE)
      set(QT_WRAP_CPP "YES")
   endif ()

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

Summary of changes:
 Modules/FindQt4.cmake     |    5 +++++
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake