Skip to content

Commit 4c987ce

Browse files
committed
Workaround extra .lib inclusion with meson tags
1 parent 9509420 commit 4c987ce

File tree

6 files changed

+8
-5
lines changed

6 files changed

+8
-5
lines changed

buildconfig/stubs/meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ install_subdir(
33
exclude_files: '.flake8',
44
install_dir: pg_dir,
55
strip_directory: true,
6+
install_tag: 'pg-tag',
67
)

docs/meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ if fs.is_dir('generated')
99
],
1010
exclude_files: ['.buildinfo', 'objects.inv'],
1111
install_dir: pg_dir / 'docs',
12+
install_tag: 'pg-tag',
1213
)
1314
elif get_option('error_docs_missing')
1415
error('The "generated" docs folder does not exist!')

meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ if plat == 'win' and host_machine.cpu_family().startswith('x86')
149149
endif
150150

151151
# put dlls in root of install
152-
install_data(dlls, install_dir: pg_dir)
152+
install_data(dlls, install_dir: pg_dir, install_tag: 'pg-tag')
153153
else
154154
bases = ['/usr/local', '/usr', '/opt/homebrew', '/opt/local']
155155
foreach inc_dir : bases
@@ -346,6 +346,6 @@ if not get_option('stripped')
346346
subdir('docs')
347347
subdir('test')
348348
subdir('buildconfig/stubs')
349-
install_subdir('examples', install_dir: pg_dir)
349+
install_subdir('examples', install_dir: pg_dir, install_tag: 'pg-tag')
350350
# TODO: install headers? not really important though
351351
endif

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@ hook-dirs = 'pygame.__pyinstaller:get_hook_dirs'
5151
requires = ["meson-python", "ninja"] # add cython here when needed
5252
build-backend = 'mesonpy'
5353

54+
[tool.meson-python.args]
55+
install = ['--tags=runtime,python-runtime,pg-tag']
5456
# uncomment to get werror locally
55-
# [tool.meson-python.args]
5657
# setup = ["-Derror_on_warns=true"]
5758

5859
[tool.cibuildwheel.config-settings]

src_py/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ data_files = files(
3434
'pygame_icon.icns',
3535
'pygame_icon_mac.bmp',
3636
)
37-
install_data(data_files, install_dir: pg_dir)
37+
install_data(data_files, install_dir: pg_dir, install_tag: 'pg-tag')
3838

3939
subdir('_sdl2')
4040
subdir('__pyinstaller')

test/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@ test_files = files(
5858

5959
py.install_sources(test_files, subdir: pg / 'tests')
6060

61-
install_subdir('fixtures', install_dir: pg_dir / 'tests')
61+
install_subdir('fixtures', install_dir: pg_dir / 'tests', install_tag: 'pg-tag')
6262
subdir('test_utils')

0 commit comments

Comments
 (0)