diff --git a/src/Mod/Part/App/CMakeLists.txt b/src/Mod/Part/App/CMakeLists.txt
index 9cb45dbc4..03b096c70 100644
--- a/src/Mod/Part/App/CMakeLists.txt
+++ b/src/Mod/Part/App/CMakeLists.txt
@@ -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
@@ -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}
@@ -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 
diff --git a/src/Mod/Part/App/Geom2d/CMakeLists.txt b/src/Mod/Part/App/Geom2d/CMakeLists.txt
deleted file mode 100644
index 637ed6fa9..000000000
--- a/src/Mod/Part/App/Geom2d/CMakeLists.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-generate_from_xml(ArcOfCircle2dPy)
-generate_from_xml(ArcOfConic2dPy)
-generate_from_xml(ArcOfEllipse2dPy)
-generate_from_xml(ArcOfHyperbola2dPy)
-generate_from_xml(ArcOfParabola2dPy)
-generate_from_xml(BezierCurve2dPy)
-generate_from_xml(BSplineCurve2dPy)
-generate_from_xml(Circle2dPy)
-generate_from_xml(Conic2dPy)
-generate_from_xml(Ellipse2dPy)
-generate_from_xml(Geometry2dPy)
-generate_from_xml(Hyperbola2dPy)
-generate_from_xml(Curve2dPy)
-generate_from_xml(Line2dSegmentPy)
-generate_from_xml(OffsetCurve2dPy)
-generate_from_xml(Parabola2dPy)
-
-# Geom2d wrappers
-SET(Geom2dPy_SRCS
-    ArcOfCircle2dPy.xml
-    ArcOfCircle2dPyImp.cpp
-    ArcOfConic2dPy.xml
-    ArcOfConic2dPyImp.cpp
-    ArcOfEllipse2dPy.xml
-    ArcOfEllipse2dPyImp.cpp
-    ArcOfHyperbola2dPy.xml
-    ArcOfHyperbola2dPyImp.cpp
-    ArcOfParabola2dPy.xml
-    ArcOfParabola2dPyImp.cpp
-    BezierCurve2dPy.xml
-    BezierCurve2dPyImp.cpp
-    BSplineCurve2dPy.xml
-    BSplineCurve2dPyImp.cpp
-    Circle2dPy.xml
-    Circle2dPyImp.cpp
-    Conic2dPy.xml
-    Conic2dPyImp.cpp
-    Ellipse2dPy.xml
-    Ellipse2dPyImp.cpp
-    Geometry2dPy.xml
-    Geometry2dPyImp.cpp
-    Curve2dPy.xml
-    Curve2dPyImp.cpp
-    Hyperbola2dPy.xml
-    Hyperbola2dPyImp.cpp
-    Line2dSegmentPy.xml
-    Line2dSegmentPyImp.cpp
-    OffsetCurve2dPy.xml
-    OffsetCurve2dPyImp.cpp
-    Parabola2dPy.xml
-    Parabola2dPyImp.cpp
-)
-
-SOURCE_GROUP("Geom2d" FILES ${Geom2dPy_SRCS})
-
-# https://cmake.org/Wiki/CMake/Tutorials/Object_Library
-if(CMAKE_VERSION VERSION_LESS 2.8.8)
-    add_library(PartGeom2dPy ${Geom2dPy_SRCS})
-else()
-    add_library(PartGeom2dPy OBJECT ${Geom2dPy_SRCS})
-endif()