From bad4809a1c1c60e6223b6c6b68d30beb29c5c16f Mon Sep 17 00:00:00 2001 From: Uwe Date: Sun, 20 Mar 2022 22:37:38 +0100 Subject: [PATCH] [Robot] remove Python.h and Xerces --- src/Mod/Robot/App/AppRobot.cpp | 5 +---- src/Mod/Robot/App/CMakeLists.txt | 1 - src/Mod/Robot/App/PreCompiled.h | 6 ------ src/Mod/Robot/Gui/AppRobotGui.cpp | 5 +---- src/Mod/Robot/Gui/CMakeLists.txt | 1 - src/Mod/Robot/Gui/PreCompiled.h | 3 --- 6 files changed, 2 insertions(+), 19 deletions(-) diff --git a/src/Mod/Robot/App/AppRobot.cpp b/src/Mod/Robot/App/AppRobot.cpp index c699fb131b..c3507a144a 100644 --- a/src/Mod/Robot/App/AppRobot.cpp +++ b/src/Mod/Robot/App/AppRobot.cpp @@ -20,11 +20,7 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -# include -#endif #include #include @@ -46,6 +42,7 @@ #include "TrajectoryCompound.h" #include "TrajectoryDressUpObject.h" + namespace Robot { class Module : public Py::ExtensionModule { diff --git a/src/Mod/Robot/App/CMakeLists.txt b/src/Mod/Robot/App/CMakeLists.txt index a7cbaf55bf..82f90ee20f 100644 --- a/src/Mod/Robot/App/CMakeLists.txt +++ b/src/Mod/Robot/App/CMakeLists.txt @@ -15,7 +15,6 @@ include_directories( ${EIGEN3_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} - ${XercesC_INCLUDE_DIRS} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Robot/App/PreCompiled.h b/src/Mod/Robot/App/PreCompiled.h index 773769ffc0..a12d393de1 100644 --- a/src/Mod/Robot/App/PreCompiled.h +++ b/src/Mod/Robot/App/PreCompiled.h @@ -20,7 +20,6 @@ * * ***************************************************************************/ - #ifndef ROBOT_PRECOMPILED_H #define ROBOT_PRECOMPILED_H @@ -50,11 +49,6 @@ #include #include -#include - - - - #endif // _PreComp_ #endif diff --git a/src/Mod/Robot/Gui/AppRobotGui.cpp b/src/Mod/Robot/Gui/AppRobotGui.cpp index 71f1563062..2e032b67b0 100644 --- a/src/Mod/Robot/Gui/AppRobotGui.cpp +++ b/src/Mod/Robot/Gui/AppRobotGui.cpp @@ -20,11 +20,7 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -# include -#endif #include #include @@ -41,6 +37,7 @@ #include "ViewProviderTrajectoryCompound.h" #include "Workbench.h" + // use a different name to CreateCommand() void CreateRobotCommands(void); void CreateRobotCommandsExport(void); diff --git a/src/Mod/Robot/Gui/CMakeLists.txt b/src/Mod/Robot/Gui/CMakeLists.txt index a76aa5b00b..3140e66783 100644 --- a/src/Mod/Robot/Gui/CMakeLists.txt +++ b/src/Mod/Robot/Gui/CMakeLists.txt @@ -16,7 +16,6 @@ include_directories( ${OCC_INCLUDE_DIR} ${EIGEN3_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${XercesC_INCLUDE_DIRS} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/Robot/Gui/PreCompiled.h b/src/Mod/Robot/Gui/PreCompiled.h index eef0fdf91c..7a31a032ed 100644 --- a/src/Mod/Robot/Gui/PreCompiled.h +++ b/src/Mod/Robot/Gui/PreCompiled.h @@ -48,9 +48,6 @@ #ifdef _PreComp_ -// Python -#include - // standard #include #include