[RE] remove Python.h and Xerces

src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp

@@ -20,10 +20,8 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <Python.h>
 # include <TColgp_Array1OfPnt.hxx>
 # include <Geom_BSplineSurface.hxx>
 #endif

src/Mod/ReverseEngineering/App/CMakeLists.txt

@@ -1,82 +1,81 @@
-if(MSVC)
-    add_definitions(-DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH)
-else(MSVC)
-    add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H)
-endif(MSVC)
-
-if (PCL_SURFACE_FOUND AND PCL_FEATURES_FOUND)
-    add_definitions(-DHAVE_PCL_SURFACE)
-
-    if(EXISTS "${PCL_INCLUDE_DIRS}/pcl/surface/on_nurbs/fitting_surface_tdm.h")
-        add_definitions(-DHAVE_PCL_OPENNURBS)
-    endif()
-endif ()
-
-if (PCL_FILTERS_FOUND AND PCL_FEATURES_FOUND)
-    add_definitions(-DHAVE_PCL_FILTERS)
-endif ()
-
-if (PCL_SEGMENTATION_FOUND AND PCL_FEATURES_FOUND)
-    add_definitions(-DHAVE_PCL_SEGMENTATION)
-endif ()
-
-if (PCL_SAMPLE_CONSENSUS_FOUND)
-    add_definitions(-DHAVE_PCL_SAMPLE_CONSENSUS)
-endif ()
-
-include_directories(
-    ${CMAKE_SOURCE_DIR}/src
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
-    ${EIGEN3_INCLUDE_DIR}
-    ${PCL_INCLUDE_DIRS}
-    ${FLANN_INCLUDE_DIRS}
-)
-
-link_directories(${OCC_LIBRARY_DIR})
-
-set(Reen_LIBS
-    Part
-    Mesh
-    Points
-    FreeCADApp
-    ${PCL_COMMON_LIBRARIES}
-    ${PCL_KDTREE_LIBRARIES}
-    ${PCL_FEATURES_LIBRARIES}
-    ${PCL_FILTERS_LIBRARIES}
-    ${PCL_SEARCH_LIBRARIES}
-    ${PCL_SURFACE_LIBRARIES}
-    ${PCL_SEGMENTATION_LIBRARIES}
-    ${PCL_SAMPLE_CONSENSUS_LIBRARIES}
-    ${QT_QTCORE_LIBRARY}
-)
-
-SET(Reen_SRCS
-    AppReverseEngineering.cpp
-    ApproxSurface.cpp
-    ApproxSurface.h
-    BSplineFitting.cpp
-    BSplineFitting.h
-    RegionGrowing.cpp
-    RegionGrowing.h
-    SampleConsensus.cpp
-    SampleConsensus.h
-    Segmentation.cpp
-    Segmentation.h
-    SurfaceTriangulation.cpp
-    SurfaceTriangulation.h
-    PreCompiled.cpp
-    PreCompiled.h
-)
-
-add_library(ReverseEngineering SHARED ${Reen_SRCS})
-target_link_libraries(ReverseEngineering ${Reen_LIBS})
-
-
-SET_BIN_DIR(ReverseEngineering ReverseEngineering /Mod/ReverseEngineering)
-SET_PYTHON_PREFIX_SUFFIX(ReverseEngineering)
-
-INSTALL(TARGETS ReverseEngineering DESTINATION ${CMAKE_INSTALL_LIBDIR})
+if(MSVC)
+    add_definitions(-DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH)
+else(MSVC)
+    add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H)
+endif(MSVC)
+
+if (PCL_SURFACE_FOUND AND PCL_FEATURES_FOUND)
+    add_definitions(-DHAVE_PCL_SURFACE)
+
+    if(EXISTS "${PCL_INCLUDE_DIRS}/pcl/surface/on_nurbs/fitting_surface_tdm.h")
+        add_definitions(-DHAVE_PCL_OPENNURBS)
+    endif()
+endif ()
+
+if (PCL_FILTERS_FOUND AND PCL_FEATURES_FOUND)
+    add_definitions(-DHAVE_PCL_FILTERS)
+endif ()
+
+if (PCL_SEGMENTATION_FOUND AND PCL_FEATURES_FOUND)
+    add_definitions(-DHAVE_PCL_SEGMENTATION)
+endif ()
+
+if (PCL_SAMPLE_CONSENSUS_FOUND)
+    add_definitions(-DHAVE_PCL_SAMPLE_CONSENSUS)
+endif ()
+
+include_directories(
+    ${CMAKE_SOURCE_DIR}/src
+    ${Boost_INCLUDE_DIRS}
+    ${OCC_INCLUDE_DIR}
+    ${PYTHON_INCLUDE_DIRS}
+    ${ZLIB_INCLUDE_DIR}
+    ${EIGEN3_INCLUDE_DIR}
+    ${PCL_INCLUDE_DIRS}
+    ${FLANN_INCLUDE_DIRS}
+)
+
+link_directories(${OCC_LIBRARY_DIR})
+
+set(Reen_LIBS
+    Part
+    Mesh
+    Points
+    FreeCADApp
+    ${PCL_COMMON_LIBRARIES}
+    ${PCL_KDTREE_LIBRARIES}
+    ${PCL_FEATURES_LIBRARIES}
+    ${PCL_FILTERS_LIBRARIES}
+    ${PCL_SEARCH_LIBRARIES}
+    ${PCL_SURFACE_LIBRARIES}
+    ${PCL_SEGMENTATION_LIBRARIES}
+    ${PCL_SAMPLE_CONSENSUS_LIBRARIES}
+    ${QT_QTCORE_LIBRARY}
+)
+
+SET(Reen_SRCS
+    AppReverseEngineering.cpp
+    ApproxSurface.cpp
+    ApproxSurface.h
+    BSplineFitting.cpp
+    BSplineFitting.h
+    RegionGrowing.cpp
+    RegionGrowing.h
+    SampleConsensus.cpp
+    SampleConsensus.h
+    Segmentation.cpp
+    Segmentation.h
+    SurfaceTriangulation.cpp
+    SurfaceTriangulation.h
+    PreCompiled.cpp
+    PreCompiled.h
+)
+
+add_library(ReverseEngineering SHARED ${Reen_SRCS})
+target_link_libraries(ReverseEngineering ${Reen_LIBS})
+
+
+SET_BIN_DIR(ReverseEngineering ReverseEngineering /Mod/ReverseEngineering)
+SET_PYTHON_PREFIX_SUFFIX(ReverseEngineering)
+
+INSTALL(TARGETS ReverseEngineering DESTINATION ${CMAKE_INSTALL_LIBDIR})

src/Mod/ReverseEngineering/App/PreCompiled.h

@@ -78,9 +78,6 @@
 #include <BRepBuilderAPI_MakeFace.hxx>
 #include <TopoDS_Face.hxx>
 
-#include <Python.h>
-
-
 #endif
 #endif // _PreComp_
 

src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp

@@ -20,11 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#ifndef _PreComp_
-# include <Python.h>
-#endif
 
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
@@ -36,6 +32,7 @@
 #include <CXX/Extensions.hxx>
 #include <CXX/Objects.hxx>
 
+
 // use a different name to CreateCommand()
 void CreateReverseEngineeringCommands(void);
 

src/Mod/ReverseEngineering/Gui/CMakeLists.txt

@@ -13,7 +13,6 @@ include_directories(
     ${COIN3D_INCLUDE_DIRS}
     ${PYTHON_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIR}
-    ${XercesC_INCLUDE_DIRS}
 )
 link_directories(${OCC_LIBRARY_DIR})
 

src/Mod/ReverseEngineering/Gui/PreCompiled.h

@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef __PRECOMPILED_GUI__
 #define __PRECOMPILED_GUI__
 
@@ -49,10 +48,6 @@
 
 
 #ifdef _PreComp_
-
-// Python
-#include <Python.h>
-
 // standard
 #include <iostream>
 #include <assert.h>
@@ -73,7 +68,6 @@
 # include <windows.h>
 #endif
 
-
 // Qt Toolkit
 #ifndef __QtAll__
 # include <Gui/QtAll.h>