diff --git a/src/Mod/Mesh/CMakeLists.txt b/src/Mod/Mesh/CMakeLists.txt index 2b6e3f327a..e9c35d1be7 100644 --- a/src/Mod/Mesh/CMakeLists.txt +++ b/src/Mod/Mesh/CMakeLists.txt @@ -14,11 +14,11 @@ if(BUILD_GUI) list (APPEND Mesh_Scripts InitGui.py) endif(BUILD_GUI) -add_custom_target(Mesh_Data ALL +add_custom_target(MeshScripts ALL SOURCES ${Mesh_Scripts} ) -fc_target_copy_resource_flat(Mesh_Data +fc_target_copy_resource_flat(MeshScripts ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/Mod/Mesh ${Mesh_Scripts} diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt index 4dd0826a9c..51f428bfcd 100644 --- a/src/Mod/Mesh/Gui/CMakeLists.txt +++ b/src/Mod/Mesh/Gui/CMakeLists.txt @@ -142,19 +142,18 @@ SET(MeshGui_SRCS Workbench.h ) -add_library(MeshGui SHARED ${MeshGui_SRCS}) +SET(MeshGuiIcon_SVG + Resources/icons/MeshWorkbench.svg +) + +add_library(MeshGui SHARED ${MeshGui_SRCS} ${MeshGuiIcon_SVG}) target_link_libraries(MeshGui ${MeshGui_LIBS}) SET_BIN_DIR(MeshGui MeshGui /Mod/Mesh) SET_PYTHON_PREFIX_SUFFIX(MeshGui) -INSTALL(TARGETS MeshGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) - -SET(MeshGuiIcon_SVG - Resources/icons/MeshWorkbench.svg -) - fc_copy_sources(MeshGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Mesh" ${MeshGuiIcon_SVG}) +INSTALL(TARGETS MeshGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) INSTALL(FILES ${MeshGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Mesh/Resources/icons")