UPDATED no qt?_wrapp_cpp CMake macro calls needed as we set AUTOMOC to ON

modeling/libraries/mml/monitoring/CMakeLists.txt

@@ -17,7 +17,7 @@ if(MML_GENERATE_GUI)
     set(MML_GUI_MOC_SRCS SimulatorWidget.h          
                          Xmlhighlighter.h
     )
-    qt4_wrap_cpp(MML_GUI_MOCS ${MML_GUI_MOC_SRCS})
+    # qt4_wrap_cpp(MML_GUI_MOCS ${MML_GUI_MOC_SRCS}) Not needed if AUTOMOC is set to ON (CMake therefore handle moc automatically)
     set(MML_GUI_HEADERS ${MML_GUI_MOC_SRCS})
     set(MML_GUI_SRC ${MML_GUI_MOCS}
                     SimulatorWidget.cpp    

modeling/libraries/mml/monitoring/ExternalSimulatorSupport.cmake

@@ -17,7 +17,7 @@ if (SOFA_SUPPORT)
         set(SOFA_MOC_SRCS SofaWidget.h)
         set(SOFA_UIS SofaWidget.ui)
         qt4_wrap_ui(SOFA_UIS_H ${SOFA_UIS})
-        qt4_wrap_cpp(SOFA_MOCS ${SOFA_MOC_SRCS})
+        # qt4_wrap_cpp(SOFA_MOCS ${SOFA_MOC_SRCS}) Not needed if AUTOMOC is set to ON (CMake therefore handle moc automatically)
         set(SOFA_GUI_SRC SofaWidget.cpp)
     endif()
 

modeling/libraries/mml/monitoringgui/CMakeLists.txt

@@ -9,7 +9,7 @@ set(monitoringgui_UIS
 )
 
 qt4_wrap_ui(monitoringgui_UIS_H ${monitoringgui_UIS})
-qt4_wrap_cpp(monitoringgui_MOCS ${monitoringgui_MOC_SRCS})
+# qt4_wrap_cpp(monitoringgui_MOCS ${monitoringgui_MOC_SRCS}) Not needed if AUTOMOC is set to ON (CMake therefore handle moc automatically)
 
 qt4_add_resources(monitoringgui_QRC MonitoringGuiIcons.qrc)
 

sdk/cmake/modules/macros/GatherHeadersAndSources.cmake

@@ -40,9 +40,6 @@ macro(gather_headers_and_sources Name)
       set(MOC_SOURCES ${MOC_SOURCES} ${HEADER})
     endif(stream MATCHES "Q_OBJECT")
   endforeach(HEADER)
-
-  # manage Qt inherited sources
-  qt5_wrap_cpp(QT_SRCS ${MOC_SOURCES})
   
   # On Windows, Visual Studio, organize files in subdirectories
   if(MSVC)