[Import] remove unused includes and Xerces

src/Mod/Import/App/AppImportPy.cpp

@@ -20,13 +20,11 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #if defined(__MINGW32__)
 # define WNT // avoid conflict with GUID
 #endif
 #ifndef _PreComp_
-# include <Python.h>
 # include <climits>
 #if defined(__clang__)
 # pragma clang diagnostic push

src/Mod/Import/App/CMakeLists.txt

@@ -1,92 +1,91 @@
-if(MSVC)
-    add_definitions(-DFCAppImport -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH)
-else(MSVC)
-    add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H)
-endif(MSVC)
-
-
-include_directories(
-    ${CMAKE_BINARY_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${Boost_INCLUDE_DIRS}
-    ${OCC_INCLUDE_DIR}
-    ${ZLIB_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
-    ${XercesC_INCLUDE_DIRS}
-)
-
-link_directories(${OCC_LIBRARY_DIR})
-
-set(Import_LIBS
-    Part
-    #Assembly
-    ${OCC_OCAF_LIBRARIES}
-    ${OCC_OCAF_DEBUG_LIBRARIES}
-)
-
-SET(Import_SRCS
-    AppImport.cpp
-    AppImportPy.cpp
-    ExportOCAF.cpp
-    ExportOCAF.h
-    ImportOCAF.cpp
-    ImportOCAF.h
-    ImportOCAF2.cpp
-    ImportOCAF2.h
-    #ImportOCAFAssembly.cpp
-    #ImportOCAFAssembly.h
-    StepShapePy.xml
-    StepShape.h
-    StepShape.cpp
-    StepShapePyImp.cpp
-    PreCompiled.cpp
-    PreCompiled.h
-    ImpExpDxf.cpp
-    ImpExpDxf.h
-    dxf.cpp
-    dxf.h
-)
-
-SET(SCL_Resources
-    SCL/__init__.py
-    SCL/AggregationDataTypes.py
-    SCL/BaseType.py
-    SCL/Builtin.py
-    SCL/ConstructedDataTypes.py
-    SCL/essa_par.py
-    SCL/Model.py
-    SCL/Part21.py
-    SCL/Rules.py
-    SCL/SCLBase.py
-    SCL/SimpleDataTypes.py
-    SCL/TypeChecker.py
-    SCL/Utils.py
-    SCL/SimpleReader.py
-    SCL/Aufspannung.stp
-    SCL/gasket1.p21
-    SCL/Product1.stp
-    automotive_design.py     # AP214e3
-    ifc2x3.py                # IFC
-    ifc4.py                  # IFC 4
-    PlmXmlParser.py
-)
-SOURCE_GROUP("SCL" FILES ${SCL_Resources})
-
-generate_from_xml(StepShapePy)
-
-add_library(Import SHARED ${Import_SRCS})
-target_link_libraries(Import ${Import_LIBS})
-
-ADD_CUSTOM_TARGET(ImportPy ALL
-    SOURCES ${SCL_Resources}
-)
-
-fc_target_copy_resource(ImportPy 
-    ${CMAKE_SOURCE_DIR}/src/Mod/Import/App
-    ${CMAKE_BINARY_DIR}/Mod/Import
-    ${SCL_Resources})
-
-SET_BIN_DIR(Import Import /Mod/Import)
-SET_PYTHON_PREFIX_SUFFIX(Import)
-
-INSTALL(TARGETS Import DESTINATION ${CMAKE_INSTALL_LIBDIR})
+if(MSVC)
+    add_definitions(-DFCAppImport -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH)
+else(MSVC)
+    add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H)
+endif(MSVC)
+
+
+include_directories(
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${Boost_INCLUDE_DIRS}
+    ${OCC_INCLUDE_DIR}
+    ${ZLIB_INCLUDE_DIR}
+    ${PYTHON_INCLUDE_DIRS}
+)
+
+link_directories(${OCC_LIBRARY_DIR})
+
+set(Import_LIBS
+    Part
+    #Assembly
+    ${OCC_OCAF_LIBRARIES}
+    ${OCC_OCAF_DEBUG_LIBRARIES}
+)
+
+SET(Import_SRCS
+    AppImport.cpp
+    AppImportPy.cpp
+    ExportOCAF.cpp
+    ExportOCAF.h
+    ImportOCAF.cpp
+    ImportOCAF.h
+    ImportOCAF2.cpp
+    ImportOCAF2.h
+    #ImportOCAFAssembly.cpp
+    #ImportOCAFAssembly.h
+    StepShapePy.xml
+    StepShape.h
+    StepShape.cpp
+    StepShapePyImp.cpp
+    PreCompiled.cpp
+    PreCompiled.h
+    ImpExpDxf.cpp
+    ImpExpDxf.h
+    dxf.cpp
+    dxf.h
+)
+
+SET(SCL_Resources
+    SCL/__init__.py
+    SCL/AggregationDataTypes.py
+    SCL/BaseType.py
+    SCL/Builtin.py
+    SCL/ConstructedDataTypes.py
+    SCL/essa_par.py
+    SCL/Model.py
+    SCL/Part21.py
+    SCL/Rules.py
+    SCL/SCLBase.py
+    SCL/SimpleDataTypes.py
+    SCL/TypeChecker.py
+    SCL/Utils.py
+    SCL/SimpleReader.py
+    SCL/Aufspannung.stp
+    SCL/gasket1.p21
+    SCL/Product1.stp
+    automotive_design.py     # AP214e3
+    ifc2x3.py                # IFC
+    ifc4.py                  # IFC 4
+    PlmXmlParser.py
+)
+SOURCE_GROUP("SCL" FILES ${SCL_Resources})
+
+generate_from_xml(StepShapePy)
+
+add_library(Import SHARED ${Import_SRCS})
+target_link_libraries(Import ${Import_LIBS})
+
+ADD_CUSTOM_TARGET(ImportPy ALL
+    SOURCES ${SCL_Resources}
+)
+
+fc_target_copy_resource(ImportPy 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Import/App
+    ${CMAKE_BINARY_DIR}/Mod/Import
+    ${SCL_Resources})
+
+SET_BIN_DIR(Import Import /Mod/Import)
+SET_PYTHON_PREFIX_SUFFIX(Import)
+
+INSTALL(TARGETS Import DESTINATION ${CMAKE_INSTALL_LIBDIR})

src/Mod/Import/App/PreCompiled.h

@@ -49,9 +49,6 @@
 
 #ifdef _PreComp_
 
-// Python
-#include <Python.h>
-
 // standard
 #include <list>
 #include <iostream>
@@ -63,9 +60,6 @@
 #include <vector>
 #include <map>
 
-// Xerces
-#include <xercesc/util/XercesDefs.hpp>
-
 // OpenCasCade =====================================================================================
 // Base
 #include "OpenCascadeAll.h"