[Cmake-commits] CMake branch, next, updated. v2.8.11-2039-g1808c26

[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  1808c2677afff9749545e12a73eaffb52da94c74 (commit)
       via  c6f2a7a262b92b778a1b64fa1cf178f262ef8c4a (commit)
      from  1e2231a344671342dfcea0649e4339a439fa9d00 (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=1808c2677afff9749545e12a73eaffb52da94c74
commit 1808c2677afff9749545e12a73eaffb52da94c74
Merge: 1e2231a c6f2a7a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 16 15:00:47 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 16 15:00:47 2013 -0400

    Merge topic 'workaround-usr-move-qt5' into next
    
    c6f2a7a Revert "Ensure that the path to moc is valid before building with Qt 5."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6f2a7a262b92b778a1b64fa1cf178f262ef8c4a
commit c6f2a7a262b92b778a1b64fa1cf178f262ef8c4a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 16 20:59:47 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu May 16 20:59:47 2013 +0200

    Revert "Ensure that the path to moc is valid before building with Qt 5."
    
    This reverts commit 240201b1a2ce1519ba9bf45188cddb8248e852fb.

diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 0ba2433..1684fb2 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -12,8 +12,7 @@
 
 project(QtDialog)
 find_package(Qt5Widgets QUIET)
-
-if (Qt5Widgets_FOUND AND EXISTS ${QT_MOC_EXECUTABLE})
+if (Qt5Widgets_FOUND)
   include_directories(${Qt5Widgets_INCLUDE_DIRS})
   add_definitions(${Qt5Widgets_DEFINITONS})
   macro(qt4_wrap_ui)

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

Summary of changes:
 Source/QtDialog/CMakeLists.txt |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake