diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2013-11-05 18:34:22 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2013-11-05 18:34:22 +0000 |
| commit | e984a3a1c448241310006307c6865ab24014b7e3 (patch) | |
| tree | f32ee7b1238a5be5178c342fb367d0842295aaf9 /net-im/telepathy-qt4 | |
| parent | 75802bbff37ed86639abbfae24fe09ec44208234 (diff) | |
Notes
Diffstat (limited to 'net-im/telepathy-qt4')
| -rw-r--r-- | net-im/telepathy-qt4/files/patch-cmake__modules__FindQt.cmake | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/net-im/telepathy-qt4/files/patch-cmake__modules__FindQt.cmake b/net-im/telepathy-qt4/files/patch-cmake__modules__FindQt.cmake new file mode 100644 index 000000000000..e1972521a53b --- /dev/null +++ b/net-im/telepathy-qt4/files/patch-cmake__modules__FindQt.cmake @@ -0,0 +1,37 @@ +From 05fe3f4980bbc6b016e25dcf07e44afe29e377c0 Mon Sep 17 00:00:00 2001 +From: David Edmundson <kde@davidedmundson.co.uk> +Date: Sun, 29 Sep 2013 22:19:27 +0000 +Subject: 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@ispirata.com> +--- +diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake +index c2eac76..b3131f0 100644 +--- cmake/modules/FindQt.cmake ++++ 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) +-- +cgit v0.9.0.2-2-gbebe |