Fix build failures with automake

This commit is contained in:
wmayer 2012-12-06 20:13:24 +01:00
parent e12b4217bb
commit 64e1c3635d
3 changed files with 14 additions and 5 deletions

View File

@ -40,6 +40,7 @@ libDrawingGui_la_LIBADD = \
-l@PYTHON_LIB@ \
-lxerces-c \
-lTKernel \
-lTKMath \
-lFreeCADBase \
-lFreeCADApp \
-lFreeCADGui \

View File

@ -19,6 +19,7 @@ BUILT_SOURCES=\
ui_TaskFaceColors.h \
ui_TaskShapeBuilder.h \
ui_TaskLoft.h \
ui_TaskOffset.h \
ui_TaskSweep.h \
moc_CrossSections.cpp \
moc_DlgBooleanOperation.cpp \
@ -37,7 +38,9 @@ BUILT_SOURCES=\
moc_TaskFaceColors.cpp \
moc_TaskShapeBuilder.cpp \
moc_TaskLoft.cpp \
moc_TaskOffset.cpp \
moc_TaskSweep.cpp \
moc_TaskThickness.cpp \
qrc_Part.cpp
libPartGui_la_SOURCES=\
@ -78,8 +81,12 @@ libPartGui_la_SOURCES=\
TaskShapeBuilder.h \
TaskLoft.cpp \
TaskLoft.h \
TaskOffset.cpp \
TaskOffset.h \
TaskSweep.cpp \
TaskSweep.h \
TaskThickness.cpp \
TaskThickness.h \
PreCompiled.cpp \
PreCompiled.h \
SoBrepShape.cpp \
@ -238,6 +245,7 @@ EXTRA_DIST = \
TaskFaceColors.ui \
TaskShapeBuilder.ui \
TaskLoft.ui \
TaskOffset.ui \
TaskSweep.ui \
Resources/Part.qrc \
Resources/translations/Part_af.qm \

View File

@ -85,7 +85,7 @@ App::DocumentObjectExecReturn *Pocket::execute(void)
double L = Length.getValue();
if ((std::string(Type.getValueAsString()) == "Length") && (L < Precision::Confusion()))
return new App::DocumentObjectExecReturn("Pocket: Length of pocket too small");
Part::Part2DObject* sketch = 0;
std::vector<TopoDS_Wire> wires;
TopoDS_Shape support;
@ -111,7 +111,7 @@ App::DocumentObjectExecReturn *Pocket::execute(void)
try {
support.Move(invObjLoc);
gp_Dir dir(SketchVector.x,SketchVector.y,SketchVector.z);
dir.Transform(invObjLoc.Transformation());
@ -174,12 +174,12 @@ App::DocumentObjectExecReturn *Pocket::execute(void)
}
return App::DocumentObject::StdReturn;
}
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
if (std::string(e->GetMessageString()) == "TopoDS::Face" &&
(Type.getValueAsString() == "UpToFirst" || Type.getValueAsString() == "UpToFace"))
return new App::DocumentObjectExecReturn("Could not create face from sketch.\n"
(std::string(Type.getValueAsString()) == "UpToFirst" || std::string(Type.getValueAsString()) == "UpToFace"))
return new App::DocumentObjectExecReturn("Could not create face from sketch.\n"
"Intersecting sketch entities or multiple faces in a sketch are not allowed "
"for making a pocket up to a face.");
else