diff --git a/src/Mod/Material/CMakeLists.txt b/src/Mod/Material/CMakeLists.txt index 4b53cdac99..778f516b7c 100644 --- a/src/Mod/Material/CMakeLists.txt +++ b/src/Mod/Material/CMakeLists.txt @@ -14,10 +14,13 @@ SET(MaterialScripts_Files importFCMat.py MaterialEditor.py TestMaterialsApp.py - Resources/ui/materials-editor.ui Templatematerial.yml ) +SET(Material_Ui_Files + Resources/ui/materials-editor.ui +) + # SOURCE_GROUP("MaterialScripts" FILES ${MaterialScripts_Files}) SET(MaterialTools_Files materialtools/__init__.py @@ -292,15 +295,17 @@ fc_target_copy_resource(MateriaTestLib ${MaterialTest_Files}) ADD_CUSTOM_TARGET(MaterialScripts ALL - SOURCES ${MaterialScripts_Files} ${Material_QRC_SRCS} + SOURCES ${MaterialScripts_Files} ${Material_Ui_Files} ${Material_QRC_SRCS} ) fc_target_copy_resource(MaterialScripts ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/Mod/Material - ${MaterialScripts_Files}) + ${MaterialScripts_Files} + ${Material_Ui_Files}) INSTALL(FILES ${MaterialScripts_Files} DESTINATION Mod/Material) +INSTALL(FILES ${Material_Ui_Files} DESTINATION Mod/Material/Resources/ui) ADD_CUSTOM_TARGET(MaterialToolsLib ALL SOURCES ${MaterialTools_Files} @@ -369,11 +374,6 @@ fc_target_copy_resource(MaterialModelLib ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Material/ ${MaterialModel_Files}) -INSTALL( - FILES ${Material_SRCS} ${Material_QRC_SRCS} - DESTINATION Mod/Material -) - INSTALL( FILES ${MaterialTest_Files} DESTINATION Mod/Material/materialtests