diff --git a/src/Mod/Raytracing/App/CMakeLists.txt b/src/Mod/Raytracing/App/CMakeLists.txt
index db8dd13454..f625755989 100644
--- a/src/Mod/Raytracing/App/CMakeLists.txt
+++ b/src/Mod/Raytracing/App/CMakeLists.txt
@@ -59,32 +59,9 @@ SET(Raytracing_SRCS
     LuxProject.cpp
 )
 
-SET(Raytracing_Scripts
-    Init.py
-    RaytracingExample.py
-)
-
-SET(Raytracing_Templates
-    Templates/LuxClassic.lxs
-    Templates/LuxOutdoor.lxs
-    Templates/ProjectStd.pov
-    Templates/RadiosityNormal.pov
-    Templates/RadiosityOutdoorHQ.pov
-)
-
 add_library(Raytracing SHARED ${Raytracing_SRCS})
 target_link_libraries(Raytracing ${Raytracing_LIBS})
 
-fc_target_copy_resource(Raytracing 
-    ${CMAKE_SOURCE_DIR}/src/Mod/Raytracing
-    ${CMAKE_BINARY_DIR}/Mod/Raytracing
-    ${Raytracing_Scripts})
-
-fc_target_copy_resource(Raytracing 
-    ${CMAKE_SOURCE_DIR}/src/Mod/Raytracing
-    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Raytracing
-    ${Raytracing_Templates})
-
 SET_BIN_DIR(Raytracing Raytracing /Mod/Raytracing)
 SET_PYTHON_PREFIX_SUFFIX(Raytracing)
 
diff --git a/src/Mod/Raytracing/CMakeLists.txt b/src/Mod/Raytracing/CMakeLists.txt
index f1c7ae03f5..c21586e313 100644
--- a/src/Mod/Raytracing/CMakeLists.txt
+++ b/src/Mod/Raytracing/CMakeLists.txt
@@ -4,20 +4,50 @@ if(BUILD_GUI)
     add_subdirectory(Gui)
 endif(BUILD_GUI)
 
+set(Raytracing_Scripts
+    Init.py
+    RaytracingExample.py
+)
+
+if(BUILD_GUI)
+    list (APPEND Raytracing_Scripts InitGui.py)
+endif(BUILD_GUI)
+
+SET(Raytracing_Templates
+    Templates/LuxClassic.lxs
+    Templates/LuxOutdoor.lxs
+    Templates/ProjectStd.pov
+    Templates/RadiosityNormal.pov
+    Templates/RadiosityOutdoorHQ.pov
+)
+
+add_custom_target(RaytracingScripts ALL
+    SOURCES ${Raytracing_Scripts} ${Raytracing_Templates}
+)
+
+fc_target_copy_resource(RaytracingScripts
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_BINARY_DIR}/Mod/Raytracing
+    ${Raytracing_Scripts}
+)
+
+fc_target_copy_resource(RaytracingScripts
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Raytracing
+    ${Raytracing_Templates}
+)
+
 INSTALL(
     FILES
-        Init.py
-        InitGui.py
-        RaytracingExample.py
+        ${Raytracing_Scripts}
     DESTINATION
         Mod/Raytracing
 )
 
 INSTALL(
-    DIRECTORY
-        Templates
+    FILES
+        ${Raytracing_Templates}
     DESTINATION
         ${CMAKE_INSTALL_DATADIR}/Mod/Raytracing
-    FILES_MATCHING PATTERN "*.pov*" PATTERN "*.lxs*"
 )
 
diff --git a/src/Mod/Raytracing/Gui/CMakeLists.txt b/src/Mod/Raytracing/Gui/CMakeLists.txt
index cd1fd4020f..7e6c95df36 100644
--- a/src/Mod/Raytracing/Gui/CMakeLists.txt
+++ b/src/Mod/Raytracing/Gui/CMakeLists.txt
@@ -80,24 +80,18 @@ SET(RaytracingGui_SRCS
     Workbench.h
 )
 
-add_library(RaytracingGui SHARED ${RaytracingGui_SRCS})
-target_link_libraries(RaytracingGui ${RaytracingGui_LIBS})
-
-
-fc_target_copy_resource(RaytracingGui 
-    ${CMAKE_SOURCE_DIR}/src/Mod/Raytracing
-    ${CMAKE_BINARY_DIR}/Mod/Raytracing
-    InitGui.py)
-
-SET_BIN_DIR(RaytracingGui RaytracingGui /Mod/Raytracing)
-SET_PYTHON_PREFIX_SUFFIX(RaytracingGui)
-
-INSTALL(TARGETS RaytracingGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
 SET(RaytracingGuiIcon_SVG
     Resources/icons/RaytracingWorkbench.svg
 )
 
+add_library(RaytracingGui SHARED ${RaytracingGui_SRCS} ${RaytracingGuiIcon_SVG})
+target_link_libraries(RaytracingGui ${RaytracingGui_LIBS})
+
+
+SET_BIN_DIR(RaytracingGui RaytracingGui /Mod/Raytracing)
+SET_PYTHON_PREFIX_SUFFIX(RaytracingGui)
+
 fc_copy_sources(RaytracingGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Raytracing" ${RaytracingGuiIcon_SVG})
 
+INSTALL(TARGETS RaytracingGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
 INSTALL(FILES ${RaytracingGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Raytracing/Resources/icons")