Fix CMake warning: qt5_make_output_file is not part of the official API, and might be removed in Qt 6.

cMake/FreeCAD_Helpers/SetupQt.cmake

@@ -1,6 +1,7 @@
 # -------------------------------- Qt --------------------------------
 
 find_package(Qt5Core REQUIRED)
+set(CMAKE_AUTOMOC TRUE)
 
 # For FreeCAD 0.20, pegged to Ubutu 18.04 LTS:
 if(${Qt5Core_VERSION} VERSION_LESS "5.9")
@@ -32,22 +33,3 @@ if(BUILD_GUI)
       find_package(Qt5WinExtras QUIET)
     endif()
 endif(BUILD_GUI)
-
-# This is a special version of the built in macro qt5_wrap_cpp
-# It is required since moc'ed files are now included instead of being added to projects directly
-# It adds a reverse dependency to solve this
-# This has the unfortunate side effect that some files are always rebuilt
-# There is probably a cleaner solution than this
-macro(fc_wrap_cpp outfiles )
-    # get include dirs
-    qt5_get_moc_flags(moc_flags)
-    set(moc_files ${ARGN})
-
-    foreach(it ${moc_files})
-        get_filename_component(it ${it} ABSOLUTE)
-        qt5_make_output_file(${it} moc_ cpp outfile)
-        qt5_create_moc_command(${it} ${outfile} "${moc_flags}" "${moc_options}" "${moc_target}" "${moc_depends}")
-        set(${outfiles} ${${outfiles}} ${outfile})
-        add_file_dependencies(${it} ${outfile})
-    endforeach(it)
-endmacro(fc_wrap_cpp)

src/Base/CMakeLists.txt

@@ -178,13 +178,6 @@ SET(FreeCADBase_XML_SRCS
 )
 SOURCE_GROUP("XML" FILES ${FreeCADBase_XML_SRCS})
 
-set(FreeCADBase_MOC_HDRS
-    Debugger.h
-    FutureWatcherProgress.h
-)
-
-fc_wrap_cpp(FreeCADBase_MOC_SRCS ${FreeCADBase_MOC_HDRS})
-
 SET(FreeCADBase_UNITAPI_SRCS
     UnitsApi.cpp
     UnitsApiPy.cpp

src/Gui/CMakeLists.txt

@@ -278,143 +278,24 @@ SET(FreeCADGui_SDK_MOC_HDRS
 )
 endif(FREECAD_USE_3DCONNEXION AND APPLE)
 
-set(Gui_MOC_HDRS
-    Action.h
-    ActionFunction.h
-    Assistant.h
-    AutoSaver.h
-    CallTips.h
-    ComboView.h
-    Control.h
-    Clipping.h
-    DemoMode.h
-    DownloadItem.h
-    DownloadManager.h
-    DlgActionsImp.h
-    DlgActivateWindowImp.h
-    DlgUnitsCalculatorImp.h
-    DlgCommandsImp.h
-    DlgCustomizeImp.h
-    DlgCustomizeSpaceball.h
-    DlgCustomizeSpNavSettings.h
-    DlgDisplayPropertiesImp.h
-    DlgEditorImp.h
-    DlgGeneralImp.h
-    DlgInputDialogImp.h
-    DlgKeyboardImp.h
-    DlgMacroExecuteImp.h
-    DlgMacroRecordImp.h
-    DlgRunExternal.h
-    DlgEditFileIncludePropertyExternal.h
-    DlgMaterialPropertiesImp.h
-    DlgOnlineHelpImp.h
-    DlgParameterImp.h
-    DlgParameterFind.h
-    DlgPreferencesImp.h
-    DlgProjectInformationImp.h
-    DlgProjectUtility.h
-    DlgPropertyLink.h
-    DlgReportViewImp.h
-    DlgSettings3DViewImp.h
-    DlgSettingsNavigation.h
-    DlgSettingsSelection.h
-    DlgSettingsViewColor.h
-    DlgSettingsColorGradientImp.h
-    DlgSettingsDocumentImp.h
-    DlgSettingsImageImp.h
-    DlgSettingsLazyLoadedImp.h
-    DlgSettingsMacroImp.h
-    DlgSettingsUnitsImp.h
-    DlgCheckableMessageBox.h
-    DlgToolbarsImp.h
-    DlgWorkbenchesImp.h
-    TaskDlgRelocation.h
-    TaskCSysDragger.h
-    DlgUndoRedo.h
-    DockWindow.h
-    DockWindowManager.h
-    DocumentRecovery.h
-    EditorView.h
-    TextDocumentEditorView.h
-    ExpressionCompleter.h
-    DlgExpressionInput.h
-    FileDialog.h
-    Flag.h
-    GraphicsViewZoom.h
-    GraphvizView.h
-    GuiApplication.h
-    GuiApplicationNativeEventAware.h
-    InputVector.h
-    MainWindow.h
-    ManualAlignment.h
-    MDIView.h
-    NetworkRetriever.h
-    OnlineDocumentation.h
-    Placement.h
-    InputField.h
-    PrefWidgets.h
-    ProgressBar.h
-    ProgressDialog.h
-    PropertyPage.h
-    PropertyView.h
-    PythonConsole.h
-    PythonDebugger.h
-    PythonEditor.h
-    QuantitySpinBox.h
-    QListWidgetCustom.h
-    QuantitySpinBox_p.h
-    ReportView.h
-    SceneInspector.h
-    SelectionView.h
-    SpinBox.h
-    Splashscreen.h
-    TextEdit.h
-    TextureMapping.h
-    ToolBox.h
-    Transform.h
-    Tree.h
-    TreeView.h
-    ProjectView.h
-    View3DInventor.h
-    VectorListEditor.h
-    WidgetFactory.h
-    Widgets.h
-    Language/Translator.h
-    propertyeditor/PropertyEditor.h
-    propertyeditor/PropertyItem.h
-    propertyeditor/PropertyItemDelegate.h
-    propertyeditor/PropertyModel.h
-    TaskView/TaskAppearance.h
-    TaskView/TaskSelectLinkProperty.h
-    TaskView/TaskDialog.h
-    TaskView/TaskWatcher.h
-    TaskView/TaskEditControl.h
-    TaskView/TaskView.h
-    DAGView/DAGView.h
-    DAGView/DAGModel.h
-    TaskElementColors.h
-    DlgObjectSelection.h
-    DlgAddProperty.h
-    ${FreeCADGui_SDK_MOC_HDRS}
-)
-
-fc_wrap_cpp(Gui_MOC_SRCS ${Gui_MOC_HDRS})
-#SOURCE_GROUP("Moc" FILES ${Gui_MOC_SRCS})
-
 if (BUILD_QT5)
+    set_property(SOURCE GraphvizView.h GraphvizView.cpp PROPERTY SKIP_AUTOMOC ON)
     add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/moc_GraphvizView-internal.cpp
         COMMAND ${Qt5Core_MOC_EXECUTABLE} -o ${CMAKE_CURRENT_BINARY_DIR}/moc_GraphvizView-internal.cpp ${CMAKE_CURRENT_SOURCE_DIR}/GraphvizView.cpp
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/GraphvizView.cpp)
 
-    set_property(SOURCE GraphvizView.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/moc_GraphvizView-internal.cpp)
+    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/moc_GraphvizView.cpp
+        COMMAND ${Qt5Core_MOC_EXECUTABLE} -o ${CMAKE_CURRENT_BINARY_DIR}/moc_GraphvizView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/GraphvizView.h
+        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/GraphvizView.h)
 else()
     add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/moc_GraphvizView-internal.cpp
         COMMAND ${QT_MOC_EXECUTABLE} -o ${CMAKE_CURRENT_BINARY_DIR}/moc_GraphvizView-internal.cpp ${CMAKE_CURRENT_SOURCE_DIR}/GraphvizView.cpp
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/GraphvizView.cpp)
-
-    set_property(SOURCE GraphvizView.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/moc_GraphvizView-internal.cpp)
 endif()
 
+set_property(SOURCE GraphvizView.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/moc_GraphvizView-internal.cpp)
+set_property(SOURCE GraphvizView.h APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/moc_GraphvizView.cpp)
+
 SET(Gui_UIC_SRCS
     AboutApplication.ui
     Clipping.ui

src/Mod/Drawing/Gui/CMakeLists.txt

@@ -22,19 +22,6 @@ set(DrawingGui_LIBS
     FreeCADGui
 )
 
-
-set(DrawingGui_MOC_HDRS
-    DrawingView.h
-    TaskOrthoViews.h
-    TaskDialog.h
-)
-
-
-
-
-fc_wrap_cpp(DrawingGui_MOC_SRCS ${DrawingGui_MOC_HDRS})
-SOURCE_GROUP("Moc" FILES ${DrawingGui_MOC_SRCS})
-
 set(DrawingGui_UIC_SRCS
     TaskOrthoViews.ui
 )

src/Mod/Fem/Gui/CMakeLists.txt

@@ -55,51 +55,6 @@ SET(Python_SRCS
 SOURCE_GROUP("Python" FILES ${Python_SRCS})
 
 
-set(FemGui_MOC_HDRS
-    DlgSettingsFemCcxImp.h
-    DlgSettingsFemElmerImp.h
-    DlgSettingsFemExportAbaqusImp.h
-    DlgSettingsFemGeneralImp.h
-    DlgSettingsFemGmshImp.h
-    DlgSettingsFemInOutVtkImp.h
-    DlgSettingsFemMaterialImp.h
-    DlgSettingsFemZ88Imp.h
-    PropertyFemMeshItem.h
-    TaskObjectName.h
-    TaskCreateNodeSet.h
-    TaskDlgCreateNodeSet.h
-    TaskFemConstraint.h
-    TaskFemConstraintBearing.h
-    TaskFemConstraintFixed.h
-    TaskFemConstraintForce.h
-    TaskFemConstraintFluidBoundary.h
-    TaskFemConstraintPressure.h
-    TaskFemConstraintGear.h
-    TaskFemConstraintPulley.h
-    TaskFemConstraintDisplacement.h
-    TaskFemConstraintTemperature.h
-    TaskFemConstraintHeatflux.h
-    TaskFemConstraintInitialTemperature.h
-    TaskFemConstraintPlaneRotation.h
-    TaskFemConstraintContact.h
-    TaskFemConstraintTransform.h
-    TaskTetParameter.h
-    TaskAnalysisInfo.h
-    TaskDriver.h
-    TaskDlgAnalysis.h
-    TaskDlgMeshShapeNetgen.h
-)
-if(BUILD_FEM_VTK)
-    set(FemGui_MOC_HDRS
-        ${FemGui_MOC_HDRS}
-        TaskPostBoxes.h
-        ViewProviderFemPostFunction.h
-    )
-endif(BUILD_FEM_VTK)
-fc_wrap_cpp(FemGui_MOC_SRCS ${FemGui_MOC_HDRS})
-SOURCE_GROUP("Moc" FILES ${FemGui_MOC_SRCS})
-
-
 set(FemGui_UIC_SRCS
     DlgSettingsFemCcx.ui
     DlgSettingsFemElmer.ui

src/Mod/Image/Gui/CMakeLists.txt

@@ -27,24 +27,6 @@ set(ImageGui_LIBS
     ${OPENGL_glu_LIBRARY}
 )
 
-set(ImageGui_MOC_HDRS
-    ImageView.h
-    ImageOrientationDialog.h
-)
-
-if(FREECAD_USE_QTOPENGL_WIDGET)
-    list(APPEND ImageGui_MOC_HDRS
-        OpenGLImageBox.h
-    )
-else()
-    list(APPEND ImageGui_MOC_HDRS
-        GLImageBox.h
-    )
-endif()
-
-fc_wrap_cpp(ImageGui_MOC_SRCS ${ImageGui_MOC_HDRS})
-SOURCE_GROUP("Moc" FILES ${ImageGui_MOC_SRCS})
-
 SET(ImageGui_RES_SRCS
     Resources/Image.qrc
 )
@@ -62,7 +44,6 @@ else()
 endif()
 
 SET(ImageGui_SRCS
-#   ${ImageGui_MOC_SRCS}
     ${ImageGui_QRC_SRCS}
     ${ImageGui_UIC_HDRS}
     AppImageGui.cpp

src/Mod/Inspection/Gui/CMakeLists.txt

@@ -15,12 +15,6 @@ set(InspectionGui_LIBS
     FreeCADGui
 )
 
-set(InspectionGui_MOC_HDRS
-    VisualInspection.h
-)
-fc_wrap_cpp(InspectionGui_MOC_SRCS ${InspectionGui_MOC_HDRS})
-SOURCE_GROUP("Moc" FILES ${InspectionGui_MOC_SRCS})
-
 set(Dialogs_UIC_SRCS
     VisualInspection.ui
 )

src/Mod/Mesh/Gui/CMakeLists.txt

@@ -28,24 +28,6 @@ SET(MeshGui_XML_SRCS
 )
 SOURCE_GROUP("XML" FILES ${MeshGui_XML_SRCS})
 
-set(Mesh_MOC_HDRS
-    DlgEvaluateMeshImp.h
-    DlgEvaluateSettings.h
-    DlgRegularSolidImp.h
-    DlgSettingsMeshView.h
-    DlgSettingsImportExportImp.h
-    DlgDecimating.h
-    DlgSmoothing.h
-    MeshEditor.h
-    PropertyEditorMesh.h
-    RemoveComponents.h
-    RemeshGmsh.h
-    SegmentationBestFit.h
-    Selection.h
-)
-fc_wrap_cpp(Mesh_MOC_SRCS ${Mesh_MOC_HDRS})
-SOURCE_GROUP("Moc" FILES ${Mesh_MOC_SRCS})
-
 set(Dialogs_UIC_SRCS
     DlgEvaluateMesh.ui
     DlgEvaluateSettings.ui

src/Mod/MeshPart/Gui/CMakeLists.txt

@@ -34,15 +34,6 @@ set(MeshPartGui_LIBS
     FreeCADGui
 )
 
-set(MeshPartGui_MOC_HDRS
-    CrossSections.h
-    CurveOnMesh.h
-    TaskCurveOnMesh.h
-    Tessellation.h
-)
-fc_wrap_cpp(MeshPartGui_MOC_SRCS ${MeshPartGui_MOC_HDRS})
-SOURCE_GROUP("Moc" FILES ${MeshPartGui_MOC_SRCS})
-
 set(MeshPartGui_UIC_SRCS
     CrossSections.ui
     TaskCurveOnMesh.ui

src/Mod/Part/Gui/CMakeLists.txt

@@ -38,36 +38,6 @@ if (BUILD_QT5)
     )
 endif()
 
-set(PartGui_MOC_HDRS
-    CrossSections.h
-    Mirroring.h
-    DlgBooleanOperation.h
-    DlgExtrusion.h
-    DlgFilletEdges.h
-    DlgPartBoxImp.h
-    DlgPartCylinderImp.h
-    DlgPartImportIgesImp.h
-    DlgPartImportStepImp.h
-    DlgPrimitives.h
-    DlgRevolution.h
-    DlgSettings3DViewPartImp.h
-    DlgSettingsGeneral.h
-    DlgSettingsObjectColor.h
-    DlgProjectionOnSurface.h
-    PropertyEnumAttacherItem.h
-    TaskFaceColors.h
-    TaskShapeBuilder.h
-    TaskLoft.h
-    TaskOffset.h
-    TaskSweep.h
-    TaskThickness.h
-    TaskDimension.h
-    TaskCheckGeometry.h
-    TaskAttacher.h
-)
-fc_wrap_cpp(PartGui_MOC_SRCS ${PartGui_MOC_HDRS})
-SOURCE_GROUP("Moc" FILES ${PartGui_MOC_SRCS})
-
 if (BUILD_QT5)
     qt5_add_resources(PartGui_QRC_SRCS Resources/Part.qrc)
 else()

src/Mod/PartDesign/Gui/CMakeLists.txt

@@ -29,37 +29,6 @@ set(PartDesignGui_LIBS
     FreeCADGui
 )
 
-set(PartDesignGui_MOC_HDRS
-    TaskFeaturePick.h
-    TaskFeatureParameters.h
-    TaskSketchBasedParameters.h
-    TaskPadParameters.h
-    TaskPocketParameters.h
-    TaskChamferParameters.h
-    TaskFilletParameters.h
-    TaskDraftParameters.h
-    TaskThicknessParameters.h
-    TaskDressUpParameters.h
-    TaskHoleParameters.h
-    TaskRevolutionParameters.h
-    TaskTransformedMessages.h
-    TaskTransformedParameters.h
-    TaskMirroredParameters.h
-    TaskLinearPatternParameters.h
-    TaskPolarPatternParameters.h
-    TaskScaledParameters.h
-    TaskMultiTransformParameters.h
-    TaskDatumParameters.h
-    TaskShapeBinder.h
-    TaskBooleanParameters.h
-    TaskPrimitiveParameters.h
-    TaskPipeParameters.h
-    TaskLoftParameters.h
-    TaskHelixParameters.h
-)
-fc_wrap_cpp(PartDesignGui_MOC_SRCS ${PartDesignGui_MOC_HDRS})
-SOURCE_GROUP("Moc" FILES ${PartDesignGui_MOC_SRCS})
-
 if(BUILD_QT5)
     qt5_add_resources(PartDesignGui_SRCS Resources/PartDesign.qrc)
 else()

src/Mod/Path/Gui/CMakeLists.txt

@@ -33,15 +33,6 @@ endif()
 
 SOURCE_GROUP("Resources" FILES ${PathResource_SRCS})
 
-set(PathGui_MOC_HDRS
-    DlgSettingsPathColor.h
-    TaskDlgPathCompound.h
-    DlgProcessorChooser.h
-)
-fc_wrap_cpp(PathGui_MOC_SRCS ${PathGui_MOC_HDRS})
-
-SOURCE_GROUP("Moc" FILES ${PathGui_MOC_SRCS})
-
 set(PathGui_UIC_SRCS
     DlgSettingsPathColor.ui
     TaskDlgPathCompound.ui

src/Mod/Points/Gui/CMakeLists.txt

@@ -13,12 +13,6 @@ set(PointsGui_LIBS
     FreeCADGui
 )
 
-set(PointsGui_MOC_HDRS
-    DlgPointsReadImp.h
-)
-fc_wrap_cpp(PointsGui_MOC_SRCS ${PointsGui_MOC_HDRS})
-SOURCE_GROUP("Moc" FILES ${PointsGui_MOC_SRCS})
-
 set(Dialog_UIC_SRCS
     DlgPointsRead.ui
 )

src/Mod/Raytracing/Gui/CMakeLists.txt

@@ -36,12 +36,6 @@ endmacro(generate_from_py2)
 
 generate_from_py2(FreeCADpov FreeCADpov.h)
 
-set(RaytracingGui_MOC_HDRS
-    DlgSettingsRayImp.h
-)
-fc_wrap_cpp(RaytracingGui_MOC_SRCS ${RaytracingGui_MOC_HDRS})
-SOURCE_GROUP("Moc" FILES ${RaytracingGui_MOC_SRCS})
-
 SET(Resource_SRCS
     ${Resource_SRCS}
     Resources/Raytracing.qrc

src/Mod/ReverseEngineering/Gui/CMakeLists.txt

@@ -28,15 +28,6 @@ else()
     qt4_add_resources(ReenGui_QRC_SRCS Resources/ReverseEngineering.qrc)
 endif()
 
-set(ReenGui_MOC_HDRS
-    FitBSplineSurface.h
-    Poisson.h
-    Segmentation.h
-    SegmentationManual.h
-)
-fc_wrap_cpp(ReenGui_MOC_SRCS ${ReenGui_MOC_HDRS})
-SOURCE_GROUP("Moc" FILES ${ReenGui_MOC_SRCS})
-
 set(Dialogs_UIC_SRCS
     FitBSplineSurface.ui
     Poisson.ui

src/Mod/Robot/Gui/CMakeLists.txt

@@ -49,24 +49,6 @@ else()
     qt4_wrap_ui(RobotGui_UIC_HDRS ${RobotGui_UIC_SRCS})
 endif()
 
-set(RobotGui_MOC_HDRS
-    TaskTrajectory.h
-    TaskRobot6Axis.h
-    TrajectorySimulate.h
-    TaskDlgSimulate.h
-    TaskDlgEdge2Trac.h
-    TaskDlgTrajectoryDressUp.h
-    TaskDlgTrajectoryCompound.h
-    TaskRobotMessages.h
-    TaskRobotControl.h
-    TaskEdge2TracParameter.h
-    TaskTrajectoryDressUpParameter.h
-    TaskWatcher.h
-)
-fc_wrap_cpp(RobotGui_MOC_SRCS ${RobotGui_MOC_HDRS})
-SOURCE_GROUP("Qt" FILES ${PartDesignGui_MOC_SRCS})
-
-
 SET(RobotGui_SRCS_Module
     AppRobotGui.cpp
     Resources/Robot.qrc

src/Mod/Sketcher/Gui/CMakeLists.txt

@@ -25,26 +25,6 @@ set(SketcherGui_LIBS
     FreeCADGui
 )
 
-set(SketcherGui_MOC_HDRS
-    EditDatumDialog.h
-    TaskSketcherConstrains.h
-    TaskSketcherElements.h
-    TaskSketcherCreateCommands.h
-    TaskSketcherGeneral.h
-    TaskSketcherMessages.h
-    TaskSketcherSolverAdvanced.h
-    TaskSketcherValidation.h
-    TaskDlgEditSketch.h
-    SketchOrientationDialog.h
-    SketchMirrorDialog.h
-    SketcherSettings.h
-    SketchRectangularArrayDialog.h
-    SketcherRegularPolygonDialog.h
-    PropertyConstraintListItem.h
-)
-fc_wrap_cpp(SketcherGui_MOC_SRCS ${SketcherGui_MOC_HDRS})
-SOURCE_GROUP("Moc" FILES ${SketcherGui_MOC_SRCS})
-
 if(BUILD_QT5)
     qt5_add_resources(SketcherGui_SRCS Resources/Sketcher.qrc)
 else()

src/Mod/Spreadsheet/Gui/CMakeLists.txt

@@ -13,21 +13,15 @@ set(SpreadsheetGui_LIBS
     FreeCADGui
 )
 
-set(SpreadsheetGui_MOC_HDRS
-    LineEdit.h
-    SpreadsheetView.h
-    SheetModel.h
-    SheetTableView.h
-    SpreadsheetDelegate.h
-    Workbench.h
-    PropertiesDialog.h
-    qtcolorpicker.h
-)
-
 if(BUILD_QT5)
+    set_property(SOURCE qtcolorpicker.h qtcolorpicker.cpp PROPERTY SKIP_AUTOMOC ON)
     add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker-internal.cpp
         COMMAND ${Qt5Core_MOC_EXECUTABLE} -o ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker-internal.cpp ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorpicker.cpp
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorpicker.cpp)
+
+    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker.cpp
+        COMMAND ${Qt5Core_MOC_EXECUTABLE} -o ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker.cpp ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorpicker.h
+        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorpicker.h)
 else()
     add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker-internal.cpp
         COMMAND ${QT_MOC_EXECUTABLE} -o ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker-internal.cpp ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorpicker.cpp
@@ -35,10 +29,7 @@ else()
 endif()
 
 set_property(SOURCE qtcolorpicker.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker-internal.cpp)
-
-fc_wrap_cpp(SpreadsheetGui_MOC_SRCS ${SpreadsheetGui_MOC_HDRS})
-SOURCE_GROUP("Moc" FILES ${SpreadsheetGui_MOC_SRCS})
-
+set_property(SOURCE qtcolorpicker.h APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker.cpp)
 
 SET(SpreadsheetGui_RES_SRCS
     Resources/Spreadsheet.qrc
@@ -62,7 +53,6 @@ else()
 endif()
 
 SET(SpreadsheetGui_SRCS
-#   ${SpreadsheetGui_MOC_SRCS}
     ${SpreadsheetGui_QRC_SRCS}
     AppSpreadsheetGui.cpp
     Command.cpp

src/Mod/Start/Gui/CMakeLists.txt

@@ -12,12 +12,6 @@ set(StartGui_LIBS
     FreeCADGui
 )
 
-set(StartGui_MOC_HDRS
-    DlgStartPreferencesImp.h
-)
-fc_wrap_cpp(StartGui_MOC_SRCS ${StartGui_MOC_HDRS})
-SOURCE_GROUP("Moc" FILES ${StartGui_MOC_SRCS})
-
 set(StartGui_UIC_SRCS
     DlgStartPreferences.ui
 )

src/Mod/Surface/Gui/CMakeLists.txt

@@ -23,16 +23,6 @@ set(SurfaceGui_LIBS
     FreeCADGui
 )
 
-set(SurfaceGui_MOC_HDRS
-    TaskFilling.h
-    TaskFillingEdge.h
-    TaskFillingVertex.h
-    TaskGeomFillSurface.h
-    TaskSections.h
-)
-fc_wrap_cpp(SurfaceGui_MOC_SRCS ${SurfaceGui_MOC_HDRS})
-SOURCE_GROUP("Moc" FILES ${SurfaceGui_MOC_SRCS})
-
 if (BUILD_QT5)
     qt5_add_resources(SurfaceGui_QRC_SRCS Resources/Surface.qrc)
 else()

src/Mod/TechDraw/Gui/CMakeLists.txt

@@ -34,54 +34,6 @@ set(TechDrawGui_LIBS
     FreeCADGui
 )
 
-set(TechDrawGui_MOC_HDRS
-    DlgPrefsTechDrawAdvancedImp.h
-    DlgPrefsTechDrawAnnotationImp.h
-    DlgPrefsTechDrawColorsImp.h
-    DlgPrefsTechDrawDimensionsImp.h
-    DlgPrefsTechDrawGeneralImp.h
-    DlgPrefsTechDrawHLRImp.h
-    DlgPrefsTechDrawScaleImp.h
-    DlgTemplateField.h
-    MDIViewPage.h
-    mrichtextedit.h
-    mtextedit.h
-    QGEPath.h
-    QGIDrawingTemplate.h
-    QGIGhostHighlight.h
-    QGILeaderLine.h
-    QGIRichAnno.h
-    QGITemplate.h
-    QGISVGTemplate.h
-    QGIView.h
-    QGIViewDimension.h
-    QGIViewBalloon.h
-    QGIWeldSymbol.h
-    QGMText.h
-    QGTracker.h
-    QGVPage.h
-    TaskActiveView.h
-    TaskBalloon.h
-    TaskCenterLine.h
-    TaskCosmeticLine.h
-    TaskCosVertex.h
-    TaskDetail.h
-    TaskDimension.h
-    TaskGeomHatch.h
-    TaskHatch.h
-    TaskLeaderLine.h
-    TaskLinkDim.h
-    TaskLineDecor.h
-    TaskProjGroup.h
-    TaskRichAnno.h
-    TaskSectionView.h
-    TaskWeldingSymbol.h
-    SymbolChooser.h   
-)
-
-fc_wrap_cpp(TechDrawGui_MOC_SRCS ${TechDrawGui_MOC_HDRS})
-SOURCE_GROUP("Moc" FILES ${TechDrawGui_MOC_SRCS})
-
 if(BUILD_QT5)
     qt5_add_resources(TechDrawGui_SRCS Resources/TechDraw.qrc)
 else()
@@ -428,8 +380,6 @@ INSTALL(FILES ${TechDrawGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/T
 fc_copy_sources(TechDrawGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/TechDraw" ${TechDrawGuiFonts})
 INSTALL(FILES ${TechDrawGuiFonts} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/TechDraw/Resources/fonts")
 
-fc_copy_sources(TechDrawGui "${CMAKE_BINARY_DIR}/src/Mod/TechDraw/Gui" ${MRTE_HDRS})
-
 SET_BIN_DIR(TechDrawGui TechDrawGui /Mod/TechDraw)
 SET_PYTHON_PREFIX_SUFFIX(TechDrawGui)
 

src/Mod/Test/Gui/CMakeLists.txt

@@ -10,12 +10,6 @@ set(TestGui_LIBS
     FreeCADGui
 )
 
-set(Test_MOC_HDRS
-    UnitTestImp.h
-)
-fc_wrap_cpp(Test_MOC_SRCS ${Test_MOC_HDRS})
-SOURCE_GROUP("Moc" FILES ${Test_MOC_SRCS})
-
 set(Dialogs_UIC_SRCS
     UnitTest.ui
 )

src/Mod/Web/App/CMakeLists.txt

@@ -23,12 +23,6 @@ else()
     )
 endif()
 
-set(Web_MOC_HDRS
-    Server.h
-)
-fc_wrap_cpp(Web_MOC_SRCS ${Web_MOC_HDRS})
-SOURCE_GROUP("Moc" FILES ${Web_MOC_SRCS})
-
 SET(Web_SRCS
     AppWeb.cpp
     PreCompiled.cpp

src/Mod/Web/Gui/CMakeLists.txt

@@ -44,13 +44,6 @@ SET(WebGui_SRCS
     CookieJar.h     # QWebkit only
 )
 
-set(WebGui_MOC_HDRS
-    BrowserView.h
-    CookieJar.h
-)
-fc_wrap_cpp(WebGui_MOC_SRCS ${WebGui_MOC_HDRS})
-SOURCE_GROUP("Moc" FILES ${SketcherGui_MOC_SRCS})
-
 SET(WebGuiIcon_SVG
     Resources/icons/WebWorkbench.svg
 )