[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2713-g4a199d3

[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  4a199d36e8b849fc22423eaa2690cd7c4529a687 (commit)
       via  240201b1a2ce1519ba9bf45188cddb8248e852fb (commit)
      from  d4d5d2f1b68ca1657af85f74c0084651e72fd446 (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=4a199d36e8b849fc22423eaa2690cd7c4529a687
commit 4a199d36e8b849fc22423eaa2690cd7c4529a687
Merge: d4d5d2f 240201b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Apr 4 09:28:07 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 4 09:28:07 2013 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=240201b1a2ce1519ba9bf45188cddb8248e852fb
commit 240201b1a2ce1519ba9bf45188cddb8248e852fb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Apr 4 12:33:01 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Apr 4 12:35:52 2013 +0200

    Ensure that the path to moc is valid before building with Qt 5.
    
    On Arch and Fedora, the path is broken for Qt versions prior to Qt 5.0.2.

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

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

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


hooks/post-receive
-- 
CMake