From 66e8a2bef3f14424d288e4ab472eaa5343c1b55f Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Sun, 20 Mar 2022 20:44:17 +0100
Subject: [PATCH] [Spreadsheet] remove Python.h and Xerces

---
 src/Mod/Spreadsheet/App/AppSpreadsheet.cpp    |   4 +-
 src/Mod/Spreadsheet/App/CMakeLists.txt        | 117 +++++++++---------
 src/Mod/Spreadsheet/App/PreCompiled.h         |   3 -
 src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp |   3 +-
 src/Mod/Spreadsheet/Gui/CMakeLists.txt        |   1 -
 src/Mod/Spreadsheet/Gui/PreCompiled.h         |   3 -
 6 files changed, 60 insertions(+), 71 deletions(-)

diff --git a/src/Mod/Spreadsheet/App/AppSpreadsheet.cpp b/src/Mod/Spreadsheet/App/AppSpreadsheet.cpp
index 430c124dd2..9ed7ff379c 100644
--- a/src/Mod/Spreadsheet/App/AppSpreadsheet.cpp
+++ b/src/Mod/Spreadsheet/App/AppSpreadsheet.cpp
@@ -11,9 +11,6 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <Python.h>
-#endif
 
 #include <CXX/Extensions.hxx>
 #include <CXX/Objects.hxx>
@@ -23,6 +20,7 @@
 #include <Base/PyObjectBase.h>
 #include "Sheet.h"
 
+
 namespace Spreadsheet {
 class Module : public Py::ExtensionModule<Module>
 {
diff --git a/src/Mod/Spreadsheet/App/CMakeLists.txt b/src/Mod/Spreadsheet/App/CMakeLists.txt
index feeff91abb..4c4cbc3205 100644
--- a/src/Mod/Spreadsheet/App/CMakeLists.txt
+++ b/src/Mod/Spreadsheet/App/CMakeLists.txt
@@ -1,59 +1,58 @@
-if(WIN32)
-    add_definitions(-DFCAppSpreadsheet)
-endif(WIN32)
-
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${PYTHON_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
-)
-
-set(Spreadsheet_LIBS
-    FreeCADApp
-)
-
-set(Spreadsheet_SRCS
-    Cell.cpp
-    Cell.h
-    DisplayUnit.h
-    PropertySheet.cpp
-    PropertySheet.h
-    PropertySheetPy.xml
-    PropertySheetPyImp.cpp
-    PropertyColumnWidths.cpp
-    PropertyColumnWidths.h
-    PropertyColumnWidthsPy.xml
-    PropertyColumnWidthsPyImp.cpp
-    PropertyRowHeights.cpp
-    PropertyRowHeights.h
-    PropertyRowHeightsPy.xml
-    PropertyRowHeightsPyImp.cpp
-    PreCompiled.cpp
-    PreCompiled.h
-    Sheet.cpp
-    Sheet.h
-    SheetPy.xml
-    SheetPyImp.cpp
-    SheetObserver.cpp
-    SheetObserver.h
-    Utils.cpp
-    Utils.h
-    AppSpreadsheet.cpp
-)
-
-generate_from_xml(SheetPy)
-generate_from_xml(PropertySheetPy)
-generate_from_xml(PropertyColumnWidthsPy)
-generate_from_xml(PropertyRowHeightsPy)
-
-add_library(Spreadsheet SHARED ${Spreadsheet_SRCS})
-target_link_libraries(Spreadsheet ${Spreadsheet_LIBS})
-
-
-SET_BIN_DIR(Spreadsheet Spreadsheet /Mod/Spreadsheet)
-SET_PYTHON_PREFIX_SUFFIX(Spreadsheet)
-
-INSTALL(TARGETS Spreadsheet DESTINATION ${CMAKE_INSTALL_LIBDIR})
+if(WIN32)
+    add_definitions(-DFCAppSpreadsheet)
+endif(WIN32)
+
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${PYTHON_INCLUDE_DIRS}
+    ${Boost_INCLUDE_DIRS}
+    ${ZLIB_INCLUDE_DIR}
+)
+
+set(Spreadsheet_LIBS
+    FreeCADApp
+)
+
+set(Spreadsheet_SRCS
+    Cell.cpp
+    Cell.h
+    DisplayUnit.h
+    PropertySheet.cpp
+    PropertySheet.h
+    PropertySheetPy.xml
+    PropertySheetPyImp.cpp
+    PropertyColumnWidths.cpp
+    PropertyColumnWidths.h
+    PropertyColumnWidthsPy.xml
+    PropertyColumnWidthsPyImp.cpp
+    PropertyRowHeights.cpp
+    PropertyRowHeights.h
+    PropertyRowHeightsPy.xml
+    PropertyRowHeightsPyImp.cpp
+    PreCompiled.cpp
+    PreCompiled.h
+    Sheet.cpp
+    Sheet.h
+    SheetPy.xml
+    SheetPyImp.cpp
+    SheetObserver.cpp
+    SheetObserver.h
+    Utils.cpp
+    Utils.h
+    AppSpreadsheet.cpp
+)
+
+generate_from_xml(SheetPy)
+generate_from_xml(PropertySheetPy)
+generate_from_xml(PropertyColumnWidthsPy)
+generate_from_xml(PropertyRowHeightsPy)
+
+add_library(Spreadsheet SHARED ${Spreadsheet_SRCS})
+target_link_libraries(Spreadsheet ${Spreadsheet_LIBS})
+
+
+SET_BIN_DIR(Spreadsheet Spreadsheet /Mod/Spreadsheet)
+SET_PYTHON_PREFIX_SUFFIX(Spreadsheet)
+
+INSTALL(TARGETS Spreadsheet DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/src/Mod/Spreadsheet/App/PreCompiled.h b/src/Mod/Spreadsheet/App/PreCompiled.h
index 2beb405a01..98e78b7695 100644
--- a/src/Mod/Spreadsheet/App/PreCompiled.h
+++ b/src/Mod/Spreadsheet/App/PreCompiled.h
@@ -45,9 +45,6 @@
 
 #ifdef _PreComp_
 
-// Python
-#include <Python.h>
-
 // standard
 #include <iostream>
 #include <assert.h>
diff --git a/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp b/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp
index a6202f2a7c..e7f365569e 100644
--- a/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp
+++ b/src/Mod/Spreadsheet/Gui/AppSpreadsheetGui.cpp
@@ -21,10 +21,8 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <Python.h>
 # include <QIcon>
 # include <QImage>
 # include <QFileInfo>
@@ -51,6 +49,7 @@
 #include "ViewProviderSpreadsheet.h"
 #include "SpreadsheetView.h"
 
+
 // use a different name to CreateCommand()
 void CreateSpreadsheetCommands(void);
 
diff --git a/src/Mod/Spreadsheet/Gui/CMakeLists.txt b/src/Mod/Spreadsheet/Gui/CMakeLists.txt
index ae932c3245..7f0975be55 100644
--- a/src/Mod/Spreadsheet/Gui/CMakeLists.txt
+++ b/src/Mod/Spreadsheet/Gui/CMakeLists.txt
@@ -5,7 +5,6 @@ include_directories(
     ${COIN3D_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIR}
     ${PYTHON_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
 )
 
 generate_from_xml(ViewProviderSpreadsheetPy)
diff --git a/src/Mod/Spreadsheet/Gui/PreCompiled.h b/src/Mod/Spreadsheet/Gui/PreCompiled.h
index ad691286c2..16385b9d19 100644
--- a/src/Mod/Spreadsheet/Gui/PreCompiled.h
+++ b/src/Mod/Spreadsheet/Gui/PreCompiled.h
@@ -47,9 +47,6 @@
 
 #ifdef _PreComp_
 
-// Python
-#include <Python.h>
-
 // standard
 #include <iostream>
 #include <assert.h>