diff --git a/src/Mod/MeshPart/App/CMakeLists.txt b/src/Mod/MeshPart/App/CMakeLists.txt
index ada204086b..b62337cc94 100644
--- a/src/Mod/MeshPart/App/CMakeLists.txt
+++ b/src/Mod/MeshPart/App/CMakeLists.txt
@@ -58,14 +58,19 @@ SET(MeshPart_SRCS
     PreCompiled.h
 )
 
-add_library(MeshPart SHARED ${MeshPart_SRCS})
+set(MeshPart_Scripts
+    ../Init.py
+)
+
+add_library(MeshPart SHARED ${MeshPart_SRCS} ${MeshPart_Scripts})
 target_link_libraries(MeshPart ${MeshPart_LIBS})
 
 
-fc_target_copy_resource(MeshPart 
-    ${CMAKE_SOURCE_DIR}/src/Mod/MeshPart
+fc_target_copy_resource_flat(MeshPart
+    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_BINARY_DIR}/Mod/MeshPart
-    Init.py)
+    ${MeshPart_Scripts}
+)
 
 SET_BIN_DIR(MeshPart MeshPart /Mod/MeshPart)
 SET_PYTHON_PREFIX_SUFFIX(MeshPart)
diff --git a/src/Mod/MeshPart/Gui/CMakeLists.txt b/src/Mod/MeshPart/Gui/CMakeLists.txt
index f66c4cad53..b757744ddb 100644
--- a/src/Mod/MeshPart/Gui/CMakeLists.txt
+++ b/src/Mod/MeshPart/Gui/CMakeLists.txt
@@ -75,25 +75,31 @@ SET(MeshPartGui_SRCS
     Workbench.h
 )
 
-add_library(MeshPartGui SHARED ${MeshPartGui_SRCS})
+set(MeshPartGui_Scripts
+    ../InitGui.py
+)
+
+set(FLATMESH_PY_SRCS
+    MeshFlatteningCommand.py
+)
+
+add_library(MeshPartGui SHARED ${MeshPartGui_SRCS} ${MeshPartGui_Scripts} ${FLATMESH_PY_SRCS})
 target_link_libraries(MeshPartGui ${MeshPartGui_LIBS})
 
 
-fc_target_copy_resource(MeshPartGui 
-    ${CMAKE_SOURCE_DIR}/src/Mod/MeshPart
-    ${CMAKE_BINARY_DIR}/Mod/MeshPart
-    InitGui.py)
-
 SET_BIN_DIR(MeshPartGui MeshPartGui /Mod/MeshPart)
 SET_PYTHON_PREFIX_SUFFIX(MeshPartGui)
 
+fc_target_copy_resource_flat(MeshPartGui
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_BINARY_DIR}/Mod/MeshPart
+    ${MeshPartGui_Scripts}
+)
+
+fc_copy_sources(MeshPartGui
+   "${CMAKE_BINARY_DIR}/Mod/MeshPart"
+    ${FLATMESH_PY_SRCS}
+)
+
 INSTALL(TARGETS MeshPartGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
-
-
-SET(FLATMESH_PY_SRCS
-    MeshFlatteningCommand.py
-    )
-
-fc_copy_sources(MeshPartGui "${CMAKE_BINARY_DIR}/Mod/MeshPart" ${FLATMESH_PY_SRCS})
 INSTALL(FILES ${FLATMESH_PY_SRCS} DESTINATION Mod/MeshPart)