Move appstream-related to pkg/appstream

Warzone2100 · Jun 12, 2024 · b050cf5 · b050cf5
1 parent 1aada3a
commit b050cf5
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -895,7 +895,6 @@ add_subdirectory(build_tools)
 add_subdirectory(data)
 add_subdirectory(lib)
 add_subdirectory(doc)
-add_subdirectory(icons)
 add_subdirectory(po)
 add_subdirectory(src)
 add_subdirectory(pkg)

diff --git a/pkg/CMakeLists.txt b/pkg/CMakeLists.txt
@@ -1,3 +1,8 @@
+#########################
+# Appstream
+
+add_subdirectory(appstream)
+
 #########################
 # Generator-specific components
 

diff --git a/icons/CMakeLists.txt → pkg/appstream/CMakeLists.txt b/icons/CMakeLists.txt → pkg/appstream/CMakeLists.txt
@@ -52,7 +52,7 @@ if(UNIX AND NOT APPLE AND NOT WIN32 AND NOT EMSCRIPTEN)
 		DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo"
 		COMPONENT Core
 	)
-	install(FILES warzone2100.png
+	install(FILES "${PROJECT_SOURCE_DIR}/icons/warzone2100.png"
 		DESTINATION "${CMAKE_INSTALL_DATADIR}/icons"
 		RENAME "${WZ_APPSTREAM_ID}${WZ_OUTPUT_NAME_SUFFIX}.png"
 		COMPONENT Core

diff --git a/icons/autorevision_metainfo.cmake → pkg/appstream/autorevision_metainfo.cmake b/icons/autorevision_metainfo.cmake → pkg/appstream/autorevision_metainfo.cmake
diff --git a/icons/net.wz2100.warzone2100.desktop.in → ...pstream/net.wz2100.warzone2100.desktop.in b/icons/net.wz2100.warzone2100.desktop.in → ...pstream/net.wz2100.warzone2100.desktop.in
diff --git a/icons/net.wz2100.warzone2100.metainfo.xml.in → ...am/net.wz2100.warzone2100.metainfo.xml.in b/icons/net.wz2100.warzone2100.metainfo.xml.in → ...am/net.wz2100.warzone2100.metainfo.xml.in