summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-04-08 12:41:05 +0200
committerThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-04-08 16:37:24 +0200
commitde442e7b15a52729ba37946e74f2799804a77dab (patch)
treefa5d7da6ff4d4d9a54397a3ce8ed5c95f18b94aa
parent8de87c6f2e5896ab4ff7fa473293a0af26f78285 (diff)
downloadmana-de442e7b15a52729ba37946e74f2799804a77dab.tar.gz
mana-de442e7b15a52729ba37946e74f2799804a77dab.tar.bz2
mana-de442e7b15a52729ba37946e74f2799804a77dab.tar.xz
mana-de442e7b15a52729ba37946e74f2799804a77dab.zip
CMake: Use install(DIRECTORY ...) to install data files
Beats using a CMakeLists.txt in each directory and fixes a few missed files (like music and equipment slot icons).
-rw-r--r--data/CMakeLists.txt16
-rw-r--r--data/fonts/CMakeLists.txt7
-rw-r--r--data/graphics/CMakeLists.txt14
-rw-r--r--data/graphics/gui/CMakeLists.txt61
-rw-r--r--data/graphics/images/CMakeLists.txt5
-rw-r--r--data/graphics/sprites/CMakeLists.txt6
-rw-r--r--data/help/CMakeLists.txt11
-rw-r--r--data/icons/CMakeLists.txt5
-rw-r--r--data/sfx/CMakeLists.txt1
-rw-r--r--data/sfx/system/CMakeLists.txt5
10 files changed, 9 insertions, 122 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index e5dd528c..56097b6e 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,7 +1,9 @@
-SET(DATA_DIR ${PKG_DATADIR}/data)
-
-ADD_SUBDIRECTORY(fonts)
-ADD_SUBDIRECTORY(graphics)
-ADD_SUBDIRECTORY(help)
-ADD_SUBDIRECTORY(icons)
-ADD_SUBDIRECTORY(sfx)
+INSTALL(DIRECTORY
+ fonts
+ graphics
+ help
+ icons
+ music
+ sfx
+ DESTINATION ${PKG_DATADIR}/data
+)
diff --git a/data/fonts/CMakeLists.txt b/data/fonts/CMakeLists.txt
deleted file mode 100644
index f5812e5d..00000000
--- a/data/fonts/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-SET (FILES
- dejavusans.ttf
- dejavusans-bold.ttf
- dejavusans-mono.ttf
- )
-
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/fonts)
diff --git a/data/graphics/CMakeLists.txt b/data/graphics/CMakeLists.txt
deleted file mode 100644
index db8dc137..00000000
--- a/data/graphics/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-ADD_SUBDIRECTORY(gui)
-ADD_SUBDIRECTORY(images)
-ADD_SUBDIRECTORY(sprites)
-
-SET (FILES
- target-cursor-in-range-l.png
- target-cursor-in-range-m.png
- target-cursor-in-range-s.png
- target-cursor-normal-l.png
- target-cursor-normal-m.png
- target-cursor-normal-s.png
- )
-
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/)
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
deleted file mode 100644
index cc257eee..00000000
--- a/data/graphics/gui/CMakeLists.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-SET (FILES
- bubble.png
- button.png
- button-icon-confirm.png
- button-icon-cancel.png
- button-icon-equipment.png
- button-icon-inventory.png
- button-icon-setup.png
- button-icon-shortcut.png
- button-icon-skills.png
- button-icon-smilies.png
- button-icon-social.png
- button-icon-specials.png
- button-icon-status.png
- button_disabled.png
- buttonhi.png
- buttonpress.png
- checkbox.png
- circle-gray.png
- circle-green.png
- close_button.png
- colors.xml
- deepbox.png
- hscroll_left_default.png
- hscroll_left_highlight.png
- hscroll_left_pressed.png
- hscroll_right_default.png
- hscroll_right_highlight.png
- hscroll_right_pressed.png
- item_shortcut_bgr.png
- mouse.png
- progress-indicator.png
- radioin.png
- radioin_highlight.png
- radioout.png
- radioout_highlight.png
- resize.png
- selection.png
- slider.png
- slider_hilight.png
- speechbubble.xml
- sticky_button.png
- tab.png
- tab_arrows_left.png
- tab_arrows_right.png
- tab_hilight.png
- tabselected.png
- unknown-item.png
- vscroll_down_default.png
- vscroll_down_highlight.png
- vscroll_down_pressed.png
- vscroll_grey.png
- vscroll_highlight.png
- vscroll_up_default.png
- vscroll_up_highlight.png
- vscroll_up_pressed.png
- window.png
- window.xml
- )
-
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/gui)
diff --git a/data/graphics/images/CMakeLists.txt b/data/graphics/images/CMakeLists.txt
deleted file mode 100644
index 6694f254..00000000
--- a/data/graphics/images/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-SET(FILES
- login_wallpaper.png
- )
-
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/images)
diff --git a/data/graphics/sprites/CMakeLists.txt b/data/graphics/sprites/CMakeLists.txt
deleted file mode 100644
index db0c4087..00000000
--- a/data/graphics/sprites/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-SET(FILES
- error.png
- error.xml
- )
-
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/graphics/sprites)
diff --git a/data/help/CMakeLists.txt b/data/help/CMakeLists.txt
deleted file mode 100644
index c624a597..00000000
--- a/data/help/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-SET(FILES
- about.txt
- changes.txt
- commands.txt
- header.txt
- index.txt
- support.txt
- windows.txt
- )
-
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/help)
diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt
deleted file mode 100644
index ea95d96a..00000000
--- a/data/icons/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-SET(FILES
- mana.png
- )
-
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/icons)
diff --git a/data/sfx/CMakeLists.txt b/data/sfx/CMakeLists.txt
deleted file mode 100644
index e006c71f..00000000
--- a/data/sfx/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-ADD_SUBDIRECTORY(system)
diff --git a/data/sfx/system/CMakeLists.txt b/data/sfx/system/CMakeLists.txt
deleted file mode 100644
index b19c3e06..00000000
--- a/data/sfx/system/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-SET(FILES
- newmessage.ogg
- )
-
-INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/sfx/system)