Sfoglia il codice sorgente

Merge pull request #642 from finetjul/support-qt-5-6

Support Qt 5.6 compilation
Jean-Christophe Fillion-Robin 9 anni fa
parent
commit
9440d3c9d4
1 ha cambiato i file con 5 aggiunte e 1 eliminazioni
  1. 5 1
      CMake/ctkMacroGenerateMocs.cmake

+ 5 - 1
CMake/ctkMacroGenerateMocs.cmake

@@ -26,7 +26,11 @@ function(QT4_GENERATE_MOCS)
     set(moc_file ${CMAKE_CURRENT_BINARY_DIR}/moc_${source_name}${source_ext})
 
     if(CTK_QT_VERSION VERSION_GREATER "4")
-      QT5_CREATE_MOC_COMMAND(${abs_file} ${moc_file} "${_moc_flags}" "" "")
+      if(Qt5_VERSION VERSION_LESS "5.6")
+        QT5_CREATE_MOC_COMMAND(${abs_file} ${moc_file} "${_moc_flags}" "" "")
+      else()
+        QT5_CREATE_MOC_COMMAND(${abs_file} ${moc_file} "${_moc_flags}" "" "" "")
+      endif()
     else()
       QT4_CREATE_MOC_COMMAND(${abs_file} ${moc_file} "${_moc_flags}" "" "")
     endif()