kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[Drawing] remove Python.h and Xerces

Browse Source
This commit is contained in:
Uwe
2022-03-20 22:34:03 +01:00
parent c9d28b542f
commit 96ad045b91
7 changed files with 69 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Mod/Drawing/App/AppDrawing.cpp
View File

@@ -10,9 +10,6 @@
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <Python.h>
#endif
#include <Base/Console.h>
#include <Base/PyObjectBase.h>

5
src/Mod/Drawing/App/AppDrawingPy.cpp
View File

@@ -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;

135
src/Mod/Drawing/App/CMakeLists.txt
View File

@@ -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})

3
src/Mod/Drawing/App/PreCompiled.h
View File

@@ -228,9 +228,6 @@
#include <BRepPrimAPI_MakeBox.hxx>
#include <BRepPrimAPI_MakeCylinder.hxx>
#include <Python.h>
#endif // _PreComp_
#endif

5
src/Mod/Drawing/Gui/AppDrawingGui.cpp
View File

@@ -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);

1
src/Mod/Drawing/Gui/CMakeLists.txt
View File

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

3
src/Mod/Drawing/Gui/PreCompiled.h
View File

@@ -46,9 +46,6 @@
#ifdef _PreComp_
// Python
#include <Python.h>
// standard
#include <iostream>
#include <cassert>