fix install locations for Raytracing and Start module

FreeCAD · Sep 11, 2018 · dcedf9a · dcedf9a
1 parent 399c95c
commit dcedf9a
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 26 deletions.
diff --git a/src/Mod/Raytracing/CMakeLists.txt b/src/Mod/Raytracing/CMakeLists.txt
@@ -48,6 +48,6 @@ INSTALL(
     FILES
         ${Raytracing_Templates}
     DESTINATION
-        ${CMAKE_INSTALL_DATADIR}/Mod/Raytracing
+        ${CMAKE_INSTALL_DATADIR}/Mod/Raytracing/Templates
 )
 
diff --git a/src/Mod/Start/CMakeLists.txt b/src/Mod/Start/CMakeLists.txt
@@ -5,30 +5,6 @@ set(Start_Scripts
 )
 
 if(BUILD_GUI)
-    SET(StartPage_Scripts
-        StartPage.py
-        TranslationTexts.py
-        __init__.py
-    )
-
-    SET(StartPage_Resources
-        LoadMRU.py
-        LoadExample.py
-        LoadNew.py
-        LoadCustom.py
-        StartPage.css
-        StartPage.js
-        StartPage.html
-        EnableDownload.py
-        images/userhub.png
-        images/poweruserhub.png
-        images/developerhub.png
-        images/manual.png
-        images/freecad.png
-        images/installed.png
-        images/new_file_thumbnail.svg
-    )
-
     list(APPEND Start_Scripts InitGui.py)
 
     add_subdirectory(Gui)

diff --git a/src/Mod/Start/StartPage/CMakeLists.txt b/src/Mod/Start/StartPage/CMakeLists.txt
@@ -1,4 +1,36 @@
 
+SET(StartPage_Scripts
+    StartPage.py
+    TranslationTexts.py
+    __init__.py
+)
+
+SET(StartPage_PythonResources
+    LoadMRU.py
+    LoadExample.py
+    LoadNew.py
+    LoadCustom.py
+    StartPage.css
+    StartPage.js
+    StartPage.html
+    EnableDownload.py
+)
+
+SET(StartPage_ImageResources
+    images/userhub.png
+    images/poweruserhub.png
+    images/developerhub.png
+    images/manual.png
+    images/freecad.png
+    images/installed.png
+    images/new_file_thumbnail.svg
+)
+
+SET(StartPage_Resources
+    ${StartPage_PythonResources}
+    ${StartPage_ImageResources}
+)
+
 add_custom_target(StartPage ALL
     SOURCES ${StartPage_Scripts} ${StartPage_Resources}
 )
@@ -17,7 +49,11 @@ INSTALL(FILES ${StartPage_Scripts}
     DESTINATION Mod/Start/StartPage
 )
 
-INSTALL(FILES ${StartPage_Resources}
+INSTALL(FILES ${StartPage_PythonResources}
     DESTINATION ${CMAKE_INSTALL_DATADIR}/Mod/Start/StartPage
 )
 
+INSTALL(FILES ${StartPage_ImageResources}
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/Mod/Start/StartPage/images
+)
+