telepathy-qt: Fix compilation on new versions of cmake
David Edmundson
davidedmundson at kemper.freedesktop.org
Thu Oct 3 06:28:50 PDT 2013
Module: telepathy-qt
Branch: master
Commit: 05fe3f4980bbc6b016e25dcf07e44afe29e377c0
URL: http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=05fe3f4980bbc6b016e25dcf07e44afe29e377c0
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Sun Sep 29 22:19:27 2013 +0000
Fix compilation on new versions of cmake
Recent cmake has changed the argument count to
qt4_create_moc_command, we need to adjust accordingly
Reviewed-by: Dario Freddi <dario.freddi at ispirata.com>
---
cmake/modules/FindQt.cmake | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake
index c2eac76..b3131f0 100644
--- a/cmake/modules/FindQt.cmake
+++ b/cmake/modules/FindQt.cmake
@@ -74,10 +74,18 @@ ENDMACRO(QT_GET_MOC_FLAGS)
MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
IF(QT_VERSION_MAJOR MATCHES 4)
- QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
+ IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
+ QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
+ ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
+ QT4_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)
- QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
+ IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
+ QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
+ ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
+ QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
+ ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
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