Workaround extra .lib inclusion with meson tags

pygame-community · Mar 22, 2024 · 4c987ce · 4c987ce
1 parent 9509420
commit 4c987ce
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/buildconfig/stubs/meson.build b/buildconfig/stubs/meson.build
@@ -3,4 +3,5 @@ install_subdir(
     exclude_files: '.flake8',
     install_dir: pg_dir,
     strip_directory: true,
+    install_tag: 'pg-tag',
 )
diff --git a/docs/meson.build b/docs/meson.build
@@ -9,6 +9,7 @@ if fs.is_dir('generated')
         ],
         exclude_files: ['.buildinfo', 'objects.inv'],
         install_dir: pg_dir / 'docs',
+        install_tag: 'pg-tag',
     )
 elif get_option('error_docs_missing')
     error('The "generated" docs folder does not exist!')

diff --git a/meson.build b/meson.build
@@ -149,7 +149,7 @@ if plat == 'win' and host_machine.cpu_family().startswith('x86')
     endif
 
     # put dlls in root of install
-    install_data(dlls, install_dir: pg_dir)
+    install_data(dlls, install_dir: pg_dir, install_tag: 'pg-tag')
 else
     bases = ['/usr/local', '/usr', '/opt/homebrew', '/opt/local']
     foreach inc_dir : bases
@@ -346,6 +346,6 @@ if not get_option('stripped')
     subdir('docs')
     subdir('test')
     subdir('buildconfig/stubs')
-    install_subdir('examples', install_dir: pg_dir)
+    install_subdir('examples', install_dir: pg_dir, install_tag: 'pg-tag')
     # TODO: install headers? not really important though
 endif
diff --git a/pyproject.toml b/pyproject.toml
@@ -51,8 +51,9 @@ hook-dirs = 'pygame.__pyinstaller:get_hook_dirs'
 requires = ["meson-python", "ninja"]  # add cython here when needed
 build-backend = 'mesonpy'
 
+[tool.meson-python.args]
+install = ['--tags=runtime,python-runtime,pg-tag']
 # uncomment to get werror locally
-# [tool.meson-python.args]
 # setup = ["-Derror_on_warns=true"]
 
 [tool.cibuildwheel.config-settings]

diff --git a/src_py/meson.build b/src_py/meson.build
@@ -34,7 +34,7 @@ data_files = files(
     'pygame_icon.icns',
     'pygame_icon_mac.bmp',
 )
-install_data(data_files, install_dir: pg_dir)
+install_data(data_files, install_dir: pg_dir, install_tag: 'pg-tag')
 
 subdir('_sdl2')
 subdir('__pyinstaller')

diff --git a/test/meson.build b/test/meson.build
@@ -58,5 +58,5 @@ test_files = files(
 
 py.install_sources(test_files, subdir: pg / 'tests')
 
-install_subdir('fixtures', install_dir: pg_dir / 'tests')
+install_subdir('fixtures', install_dir: pg_dir / 'tests', install_tag: 'pg-tag')
 subdir('test_utils')