telepathy-qt: Fix moc command for Qt5.2

Dario Freddi drf at kemper.freedesktop.org
Sun Feb 2 06:44:05 PST 2014


Module: telepathy-qt
Branch: master
Commit: 938509e23a3a02609d96dd82abdcb5a51d104b57
URL:    http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=938509e23a3a02609d96dd82abdcb5a51d104b57

Author: Dario Freddi <dario.freddi at ispirata.com>
Date:   Sun Feb  2 15:40:38 2014 +0100

Fix moc command for Qt5.2

The check was already there, but since Qt5 CMake files are being shipped with
Qt5 itself, the check was meaningless as the only thing which matters is
Qt's version, and not CMake's one.

Reviewed-by: David Edmundson <davidedmundson at kde.org>

---

 cmake/modules/FindQt.cmake |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake
index b3131f0..8cf0f25 100644
--- a/cmake/modules/FindQt.cmake
+++ b/cmake/modules/FindQt.cmake
@@ -81,11 +81,11 @@ MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
     ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
   ELSE(QT_VERSION_MAJOR MATCHES 4)
     IF(QT_VERSION_MAJOR MATCHES 5)
-      IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
+      IF(QTVERSION VERSION_GREATER 5.1.99)
         QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
-      ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
+      ELSE()
         QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
-      ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
+      ENDIF()
     ENDIF(QT_VERSION_MAJOR MATCHES 5)
   ENDIF(QT_VERSION_MAJOR MATCHES 4)
 ENDMACRO(QT_CREATE_MOC_COMMAND)



More information about the telepathy-commits mailing list