Skip to content

Commit

Permalink
fix build failure on Linux
Browse files Browse the repository at this point in the history
  • Loading branch information
wwmayer committed Nov 23, 2016
1 parent 9734667 commit cdf4524
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 70 deletions.
68 changes: 59 additions & 9 deletions src/Mod/Part/App/CMakeLists.txt
Expand Up @@ -84,7 +84,25 @@ generate_from_xml(TopoShapeVertexPy)
generate_from_xml(TopoShapeWirePy)
generate_from_xml(BRepOffsetAPI_MakePipeShellPy)

add_subdirectory(Geom2d)
# make sure to create the directory at configure time
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Geom2d)

generate_from_xml(Geom2d/ArcOfCircle2dPy)
generate_from_xml(Geom2d/ArcOfConic2dPy)
generate_from_xml(Geom2d/ArcOfEllipse2dPy)
generate_from_xml(Geom2d/ArcOfHyperbola2dPy)
generate_from_xml(Geom2d/ArcOfParabola2dPy)
generate_from_xml(Geom2d/BezierCurve2dPy)
generate_from_xml(Geom2d/BSplineCurve2dPy)
generate_from_xml(Geom2d/Circle2dPy)
generate_from_xml(Geom2d/Conic2dPy)
generate_from_xml(Geom2d/Ellipse2dPy)
generate_from_xml(Geom2d/Geometry2dPy)
generate_from_xml(Geom2d/Hyperbola2dPy)
generate_from_xml(Geom2d/Curve2dPy)
generate_from_xml(Geom2d/Line2dSegmentPy)
generate_from_xml(Geom2d/OffsetCurve2dPy)
generate_from_xml(Geom2d/Parabola2dPy)

SET(Features_SRCS
FeaturePartBoolean.cpp
Expand Down Expand Up @@ -252,6 +270,44 @@ SET(Python_SRCS
)
SOURCE_GROUP("Python" FILES ${Python_SRCS})

# Geom2d wrappers
SET(Geom2dPy_SRCS
Geom2d/ArcOfCircle2dPy.xml
Geom2d/ArcOfCircle2dPyImp.cpp
Geom2d/ArcOfConic2dPy.xml
Geom2d/ArcOfConic2dPyImp.cpp
Geom2d/ArcOfEllipse2dPy.xml
Geom2d/ArcOfEllipse2dPyImp.cpp
Geom2d/ArcOfHyperbola2dPy.xml
Geom2d/ArcOfHyperbola2dPyImp.cpp
Geom2d/ArcOfParabola2dPy.xml
Geom2d/ArcOfParabola2dPyImp.cpp
Geom2d/BezierCurve2dPy.xml
Geom2d/BezierCurve2dPyImp.cpp
Geom2d/BSplineCurve2dPy.xml
Geom2d/BSplineCurve2dPyImp.cpp
Geom2d/Circle2dPy.xml
Geom2d/Circle2dPyImp.cpp
Geom2d/Conic2dPy.xml
Geom2d/Conic2dPyImp.cpp
Geom2d/Ellipse2dPy.xml
Geom2d/Ellipse2dPyImp.cpp
Geom2d/Geometry2dPy.xml
Geom2d/Geometry2dPyImp.cpp
Geom2d/Curve2dPy.xml
Geom2d/Curve2dPyImp.cpp
Geom2d/Hyperbola2dPy.xml
Geom2d/Hyperbola2dPyImp.cpp
Geom2d/Line2dSegmentPy.xml
Geom2d/Line2dSegmentPyImp.cpp
Geom2d/OffsetCurve2dPy.xml
Geom2d/OffsetCurve2dPyImp.cpp
Geom2d/Parabola2dPy.xml
Geom2d/Parabola2dPyImp.cpp
)

SOURCE_GROUP("Geom2d" FILES ${Geom2dPy_SRCS})

SET(Part_SRCS
${Features_SRCS}
${Properties_SRCS}
Expand Down Expand Up @@ -316,14 +372,8 @@ SET(Part_Scripts
BOPTools/Utils.py
)

# https://cmake.org/Wiki/CMake/Tutorials/Object_Library
if(CMAKE_VERSION VERSION_LESS 2.8.8)
add_library(Part SHARED ${Part_SRCS})
target_link_libraries(Part ${Part_LIBS} PartGeom2dPy)
else()
add_library(Part SHARED ${Part_SRCS} $<TARGET_OBJECTS:PartGeom2dPy>)
target_link_libraries(Part ${Part_LIBS})
endif()
add_library(Part SHARED ${Part_SRCS})
target_link_libraries(Part ${Part_LIBS})


fc_target_copy_resource(Part
Expand Down
61 changes: 0 additions & 61 deletions src/Mod/Part/App/Geom2d/CMakeLists.txt

This file was deleted.

0 comments on commit cdf4524

Please sign in to comment.