Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Meson version fixes #473

Merged
merged 2 commits into from
Feb 16, 2025
Merged

Meson version fixes #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be20e63
meson: Disable unused fs import
bgilbert Feb 14, 2025
9cc10b9
meson: Bump minimum Meson version to 0.52 for visibility:hidden
bgilbert Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,14 @@ jobs:
- name: Install packages
run: |
sudo apt-get -y install build-essential python3-pip ninja-build
pip install meson==0.64.0
pip install meson==0.52.0

- name: Build Ubuntu
run: |
meson setup build -Dfastfloat=true -Dthreaded=true
meson compile -C build
meson test -C build
cd build
ninja
meson test

VisualStudio-meson:
runs-on: windows-latest
Expand All @@ -77,12 +78,13 @@ jobs:

- name: Install packages
run: |
pip install meson==0.64.0
pip install meson==0.52.0

- uses: ilammy/msvc-dev-cmd@v1
- name: Build Windows
run: |
meson setup build
meson compile -C build
meson test -C build
cd build
ninja
meson test

2 changes: 1 addition & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ project(
'Little-CMS',
'c',
version: '2.17',
meson_version: '>=0.49.0',
meson_version: '>=0.52.0',
# default_options: ['c_std=c99']
)

Expand Down
2 changes: 1 addition & 1 deletion testbed/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ iccs = [
'bad_mpe.icc', 'ibm-t61.icc', 'test1.icc', 'test3.icc', 'test5.icc',
'toosmall.icc'
]
fs=import('fs')
# fs=import('fs') - requires Meson >=0.53.0
foreach icc : iccs
# fs.copyfile(icc) # DOES NOT WORK ON FEDORA 40
configure_file(input : icc, output : icc, copy : true)
Expand Down
Loading