From 52718e96f5de49162c17f3b0335e982a2580c73e Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Tue, 10 Aug 2021 15:35:38 +0200 Subject: [PATCH] Moved flatpak files from resources/data to src/platform/unix (#6774) --- CMakeLists.txt | 2 +- .../platform/unix}/flatpak/com.prusa3d.PrusaSlicer.desktop | 0 .../platform/unix}/flatpak/com.prusa3d.PrusaSlicer.metainfo.xml | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {resources/data => src/platform/unix}/flatpak/com.prusa3d.PrusaSlicer.desktop (100%) rename {resources/data => src/platform/unix}/flatpak/com.prusa3d.PrusaSlicer.metainfo.xml (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 268380dc2..9a69d3bbf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -569,7 +569,7 @@ elseif (SLIC3R_FHS) # CMAKE_INSTALL_FULL_DATAROOTDIR: read-only architecture-independent data root (share) set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/PrusaSlicer") install(DIRECTORY ${SLIC3R_RESOURCES_DIR}/ DESTINATION ${SLIC3R_FHS_RESOURCES} - PATTERN "*/data" EXCLUDE PATTERN "*/udev" EXCLUDE + PATTERN "*/udev" EXCLUDE ) install(FILES src/platform/unix/PrusaSlicer.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) install(FILES src/platform/unix/PrusaGcodeviewer.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) diff --git a/resources/data/flatpak/com.prusa3d.PrusaSlicer.desktop b/src/platform/unix/flatpak/com.prusa3d.PrusaSlicer.desktop similarity index 100% rename from resources/data/flatpak/com.prusa3d.PrusaSlicer.desktop rename to src/platform/unix/flatpak/com.prusa3d.PrusaSlicer.desktop diff --git a/resources/data/flatpak/com.prusa3d.PrusaSlicer.metainfo.xml b/src/platform/unix/flatpak/com.prusa3d.PrusaSlicer.metainfo.xml similarity index 100% rename from resources/data/flatpak/com.prusa3d.PrusaSlicer.metainfo.xml rename to src/platform/unix/flatpak/com.prusa3d.PrusaSlicer.metainfo.xml