From 96ad045b91e4083782f5b7ef55e6479062c57d3b Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Sun, 20 Mar 2022 22:34:03 +0100
Subject: [PATCH] [Drawing] remove Python.h and Xerces

---
 src/Mod/Drawing/App/AppDrawing.cpp    |   3 -
 src/Mod/Drawing/App/AppDrawingPy.cpp  |   5 +-
 src/Mod/Drawing/App/CMakeLists.txt    | 135 +++++++++++++-------------
 src/Mod/Drawing/App/PreCompiled.h     |   3 -
 src/Mod/Drawing/Gui/AppDrawingGui.cpp |   5 +-
 src/Mod/Drawing/Gui/CMakeLists.txt    |   1 -
 src/Mod/Drawing/Gui/PreCompiled.h     |   3 -
 7 files changed, 69 insertions(+), 86 deletions(-)

diff --git a/src/Mod/Drawing/App/AppDrawing.cpp b/src/Mod/Drawing/App/AppDrawing.cpp
index 6edecc46e0..4780b583b3 100644
--- a/src/Mod/Drawing/App/AppDrawing.cpp
+++ b/src/Mod/Drawing/App/AppDrawing.cpp
@@ -10,9 +10,6 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <Python.h>
-#endif
 
 #include <Base/Console.h>
 #include <Base/PyObjectBase.h>
diff --git a/src/Mod/Drawing/App/AppDrawingPy.cpp b/src/Mod/Drawing/App/AppDrawingPy.cpp
index 1860566b31..abd36f76d9 100644
--- a/src/Mod/Drawing/App/AppDrawingPy.cpp
+++ b/src/Mod/Drawing/App/AppDrawingPy.cpp
@@ -20,11 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <Python.h>
-#endif
 
 #include <CXX/Extensions.hxx>
 #include <CXX/Objects.hxx>
@@ -37,6 +33,7 @@
 
 #include <Mod/Part/App/OCCError.h>
 
+
 using namespace std;
 using Part::TopoShapePy;
 using Part::TopoShape;
diff --git a/src/Mod/Drawing/App/CMakeLists.txt b/src/Mod/Drawing/App/CMakeLists.txt
index d176c535fc..a6e0ff1c4b 100644
--- a/src/Mod/Drawing/App/CMakeLists.txt
+++ b/src/Mod/Drawing/App/CMakeLists.txt
@@ -1,68 +1,67 @@
-if(MSVC)
-    add_definitions(-DFCAppDrawing -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH)
-else(MSVC)
-    add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H -DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH)
-endif(MSVC)
-
-include_directories(
-    ${CMAKE_BINARY_DIR}
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-link_directories(${OCC_LIBRARY_DIR})
-
-set(Drawing_LIBS
-    Part
-    Spreadsheet
-    FreeCADApp
-)
-
-SET(Features_SRCS
-    FeaturePage.cpp
-    FeaturePage.h
-    FeatureProjection.cpp
-    FeatureProjection.h
-    FeatureView.cpp
-    FeatureView.h
-    FeatureViewPart.cpp
-    FeatureViewPart.h
-    FeatureViewAnnotation.cpp
-    FeatureViewAnnotation.h
-    FeatureViewSymbol.cpp
-    FeatureViewSymbol.h
-    FeatureClip.cpp
-    FeatureClip.h
-    PageGroup.cpp
-    PageGroup.h
-    FeatureViewSpreadsheet.cpp
-    FeatureViewSpreadsheet.h
-)
-
-SET(Drawing_SRCS
-    AppDrawing.cpp
-    AppDrawingPy.cpp
-    PreCompiled.cpp
-    PreCompiled.h
-)
-
-SET(DrawingAlgos_SRCS
-    DrawingExport.cpp
-    DrawingExport.h
-    ProjectionAlgos.cpp
-    ProjectionAlgos.h
-)
-
-SOURCE_GROUP("Mod" FILES ${Drawing_SRCS})
-SOURCE_GROUP("Features" FILES ${Features_SRCS})
-SOURCE_GROUP("Algorithms" FILES ${DrawingAlgos_SRCS})
-
-add_library(Drawing SHARED ${Drawing_SRCS} ${Features_SRCS} ${DrawingAlgos_SRCS})
-target_link_libraries(Drawing ${Drawing_LIBS})
-
-SET_BIN_DIR(Drawing Drawing /Mod/Drawing)
-SET_PYTHON_PREFIX_SUFFIX(Drawing)
-
-INSTALL(TARGETS Drawing DESTINATION ${CMAKE_INSTALL_LIBDIR})
+if(MSVC)
+    add_definitions(-DFCAppDrawing -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH)
+else(MSVC)
+    add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H -DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH)
+endif(MSVC)
+
+include_directories(
+    ${CMAKE_BINARY_DIR}
+    ${Boost_INCLUDE_DIRS}
+    ${OCC_INCLUDE_DIR}
+    ${ZLIB_INCLUDE_DIR}
+    ${PYTHON_INCLUDE_DIRS}
+)
+link_directories(${OCC_LIBRARY_DIR})
+
+set(Drawing_LIBS
+    Part
+    Spreadsheet
+    FreeCADApp
+)
+
+SET(Features_SRCS
+    FeaturePage.cpp
+    FeaturePage.h
+    FeatureProjection.cpp
+    FeatureProjection.h
+    FeatureView.cpp
+    FeatureView.h
+    FeatureViewPart.cpp
+    FeatureViewPart.h
+    FeatureViewAnnotation.cpp
+    FeatureViewAnnotation.h
+    FeatureViewSymbol.cpp
+    FeatureViewSymbol.h
+    FeatureClip.cpp
+    FeatureClip.h
+    PageGroup.cpp
+    PageGroup.h
+    FeatureViewSpreadsheet.cpp
+    FeatureViewSpreadsheet.h
+)
+
+SET(Drawing_SRCS
+    AppDrawing.cpp
+    AppDrawingPy.cpp
+    PreCompiled.cpp
+    PreCompiled.h
+)
+
+SET(DrawingAlgos_SRCS
+    DrawingExport.cpp
+    DrawingExport.h
+    ProjectionAlgos.cpp
+    ProjectionAlgos.h
+)
+
+SOURCE_GROUP("Mod" FILES ${Drawing_SRCS})
+SOURCE_GROUP("Features" FILES ${Features_SRCS})
+SOURCE_GROUP("Algorithms" FILES ${DrawingAlgos_SRCS})
+
+add_library(Drawing SHARED ${Drawing_SRCS} ${Features_SRCS} ${DrawingAlgos_SRCS})
+target_link_libraries(Drawing ${Drawing_LIBS})
+
+SET_BIN_DIR(Drawing Drawing /Mod/Drawing)
+SET_PYTHON_PREFIX_SUFFIX(Drawing)
+
+INSTALL(TARGETS Drawing DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/src/Mod/Drawing/App/PreCompiled.h b/src/Mod/Drawing/App/PreCompiled.h
index ca2dccc5e8..fe8b73dee9 100644
--- a/src/Mod/Drawing/App/PreCompiled.h
+++ b/src/Mod/Drawing/App/PreCompiled.h
@@ -228,9 +228,6 @@
 #include <BRepPrimAPI_MakeBox.hxx>
 #include <BRepPrimAPI_MakeCylinder.hxx>
 
-#include <Python.h>
-
-
 #endif // _PreComp_
 #endif
 
diff --git a/src/Mod/Drawing/Gui/AppDrawingGui.cpp b/src/Mod/Drawing/Gui/AppDrawingGui.cpp
index 5e940cb25c..4722fbe061 100644
--- a/src/Mod/Drawing/Gui/AppDrawingGui.cpp
+++ b/src/Mod/Drawing/Gui/AppDrawingGui.cpp
@@ -20,11 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <Python.h>
-#endif
 
 #include <Base/Console.h>
 #include <Base/PyObjectBase.h>
@@ -34,6 +30,7 @@
 #include "ViewProviderPage.h"
 #include "ViewProviderView.h"
 
+
 // use a different name to CreateCommand()
 void CreateDrawingCommands(void);
 
diff --git a/src/Mod/Drawing/Gui/CMakeLists.txt b/src/Mod/Drawing/Gui/CMakeLists.txt
index 5579504cb4..d5f90073b2 100644
--- a/src/Mod/Drawing/Gui/CMakeLists.txt
+++ b/src/Mod/Drawing/Gui/CMakeLists.txt
@@ -13,7 +13,6 @@ include_directories(
     ${PYTHON_INCLUDE_DIRS}
     ${OCC_INCLUDE_DIR}
     ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
 )
 link_directories(${OCC_LIBRARY_DIR})
 
diff --git a/src/Mod/Drawing/Gui/PreCompiled.h b/src/Mod/Drawing/Gui/PreCompiled.h
index 05d60b4ecd..fe847206b9 100644
--- a/src/Mod/Drawing/Gui/PreCompiled.h
+++ b/src/Mod/Drawing/Gui/PreCompiled.h
@@ -46,9 +46,6 @@
 
 #ifdef _PreComp_
 
-// Python
-#include <Python.h>
-
 // standard
 #include <iostream>
 #include <cassert>