diff --git a/src/Mod/TechDraw/App/CMakeLists.txt b/src/Mod/TechDraw/App/CMakeLists.txt
index 1e3d8e964c..cbdd9ecb1e 100644
--- a/src/Mod/TechDraw/App/CMakeLists.txt
+++ b/src/Mod/TechDraw/App/CMakeLists.txt
@@ -154,14 +154,6 @@ SOURCE_GROUP("Features" FILES ${Draw_SRCS})
 SOURCE_GROUP("Geometry" FILES ${Geometry_SRCS})
 SOURCE_GROUP("Python" FILES ${Python_SRCS})
 
-SET(TechDraw_PATFile
-    PAT/FCPAT.pat
-)
-
-SET(TechDraw_LineGroupFile
-    LineGroup/LineGroup.csv
-)
-
 if(BUILD_USE_PCH)
     #add_definitions(-D_PreComp_)
     #GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" TechDrawCPP_SRCS ${TechDraw_SRCS} ${Draw_SRCS} )
@@ -172,26 +164,6 @@ add_library(TechDraw SHARED ${TechDraw_SRCS} ${Draw_SRCS} ${TechDrawAlgos_SRCS}
                            ${Geometry_SRCS} ${Python_SRCS})
 target_link_libraries(TechDraw ${TechDrawLIBS};${QT_QTXML_LIBRARY};${TechDraw})
 
-SET(TechDrawScripts
-    Init.py
-    TestTechDrawApp.py
-)
-
-fc_target_copy_resource(TechDraw
-    ${CMAKE_SOURCE_DIR}/src/Mod/TechDraw
-    ${CMAKE_BINARY_DIR}/Mod/TechDraw
-    ${TechDrawScripts})
-
-fc_target_copy_resource(TechDraw
-    ${CMAKE_SOURCE_DIR}/src/Mod/TechDraw
-    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/TechDraw
-    ${TechDraw_PATFile})
-
-fc_target_copy_resource(TechDraw
-    ${CMAKE_SOURCE_DIR}/src/Mod/TechDraw
-    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/TechDraw
-    ${TechDraw_LineGroupFile})
-
 ADD_CUSTOM_COMMAND(TARGET TechDraw
                    POST_BUILD
                    COMMAND ${CMAKE_COMMAND} -E copy_directory
diff --git a/src/Mod/TechDraw/CMakeLists.txt b/src/Mod/TechDraw/CMakeLists.txt
index 66feb4fdee..c036221fc6 100644
--- a/src/Mod/TechDraw/CMakeLists.txt
+++ b/src/Mod/TechDraw/CMakeLists.txt
@@ -6,11 +6,46 @@ if(BUILD_GUI)
     add_subdirectory(Gui)
 endif(BUILD_GUI)
 
+set(TechDraw_Scripts
+    Init.py
+    TestTechDrawApp.py
+)
+
+if(BUILD_GUI)
+    list (APPEND TechDraw_Scripts InitGui.py)
+endif(BUILD_GUI)
+
+SET(TechDraw_PATFile
+    PAT/FCPAT.pat
+)
+
+SET(TechDraw_LineGroupFile
+    LineGroup/LineGroup.csv
+)
+
+add_custom_target(TechDraw_Data ALL
+    SOURCES ${TechDraw_Scripts} ${TechDraw_PATFile} ${TechDraw_LineGroupFile}
+)
+
+fc_target_copy_resource(TechDraw_Data
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_BINARY_DIR}/Mod/TechDraw
+    ${TechDraw_Scripts}
+)
+
+fc_target_copy_resource(TechDraw_Data
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/TechDraw
+    ${TechDraw_PATFile})
+
+fc_target_copy_resource(TechDraw_Data
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/TechDraw
+    ${TechDraw_LineGroupFile})
+
 INSTALL(
     FILES
-        Init.py
-        InitGui.py
-        TestTechDrawApp.py
+        ${TechDraw_Scripts}
     DESTINATION
         Mod/TechDraw
 )
diff --git a/src/Mod/TechDraw/Gui/CMakeLists.txt b/src/Mod/TechDraw/Gui/CMakeLists.txt
index 7900902594..d6d54b3807 100644
--- a/src/Mod/TechDraw/Gui/CMakeLists.txt
+++ b/src/Mod/TechDraw/Gui/CMakeLists.txt
@@ -65,6 +65,7 @@ else()
 endif()
 
 SET(TechDrawGui_SRCS
+    ${CMAKE_SOURCE_DIR}/src/Mod/TechDraw/InitGui.py
     ${TechDrawGui_SRCS}
     AppTechDrawGui.cpp
     AppTechDrawGuiPy.cpp
@@ -226,33 +227,23 @@ SET(TechDrawGuiTaskDlgs_SRCS
 )
 SOURCE_GROUP("TaskDialogs" FILES ${TechDrawGuiTaskDlgs_SRCS})
 
-if(BUILD_USE_PCH)
-    #add_definitions(-D_PreComp_)
-    #GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${TechDrawGui_SRCS} ${TechDrawGuiView_SRCS} ${TechDrawGuiViewProvider_SRCS})
-    #ADD_MSVC_PRECOMPILED_HEADER(TechDrawGui PreCompiled.h PreCompiled.cpp PCH_SRCS)
-endif(BUILD_USE_PCH)
-
-add_library(TechDrawGui SHARED ${TechDrawGui_SRCS} ${TechDrawGuiView_SRCS} ${TechDrawGuiViewProvider_SRCS})
-target_link_libraries(TechDrawGui ${TechDrawGui_LIBS})
-
-fc_target_copy_resource(TechDrawGui
-    ${CMAKE_SOURCE_DIR}/src/Mod/TechDraw
-    ${CMAKE_BINARY_DIR}/Mod/TechDraw
-    InitGui.py)
-
 SET(TechDrawGuiIcon_SVG
     Resources/icons/preferences-techdraw.svg
 )
 
-fc_copy_sources(TechDrawGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/TechDraw" ${TechDrawGuiIcon_SVG})
-
-INSTALL(FILES ${TechDrawGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/TechDraw/Resources/icons")
-
 ##install OSIFONT
 SET(TechDrawGuiFonts
     Resources/fonts/osifont-lgpl3fe.ttf
     Resources/fonts/osifont.license
 )
+
+add_library(TechDrawGui SHARED ${TechDrawGui_SRCS} ${TechDrawGuiView_SRCS} ${TechDrawGuiViewProvider_SRCS}
+                               ${TechDrawGuiIcon_SVG} ${TechDrawGuiFonts})
+target_link_libraries(TechDrawGui ${TechDrawGui_LIBS})
+
+fc_copy_sources(TechDrawGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/TechDraw" ${TechDrawGuiIcon_SVG})
+INSTALL(FILES ${TechDrawGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/TechDraw/Resources/icons")
+
 fc_copy_sources(TechDrawGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/TechDraw" ${TechDrawGuiFonts})
 INSTALL(FILES ${TechDrawGuiFonts} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/TechDraw/Resources/fonts")