forked from mirrors/nixpkgs
26 lines
1.3 KiB
Diff
26 lines
1.3 KiB
Diff
|
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)
|