Skip to content

Commit 6df039c

Browse files
authored
Fix meson formatting
1 parent 398038f commit 6df039c

File tree

4 files changed

+14
-15
lines changed

4 files changed

+14
-15
lines changed

src/sage/libs/meson.build

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ if not braiding.found()
77
braiding = cc.find_library('braiding')
88
endif
99
gc = dependency(['bdw-gc-threaded', 'bdw-gc'], version: '>=7.6.4')
10-
homfly = cc.find_library('homfly', has_headers: ['homfly.h'], required: false, disabler: true)
10+
homfly = cc.find_library(
11+
'homfly',
12+
has_headers: ['homfly.h'],
13+
required: false,
14+
disabler: true,
15+
)
1116

1217
py.install_sources(
1318
'__init__.py',

src/sage/modules/meson.build

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,7 @@ foreach name, pyx : extension_data
7373
sources: pyx,
7474
subdir: 'sage/modules',
7575
install: true,
76-
include_directories: [
77-
inc_cpython,
78-
inc_ext,
79-
inc_rings,
80-
inc_rings_finite,
81-
],
76+
include_directories: [inc_cpython, inc_ext, inc_rings, inc_rings_finite],
8277
dependencies: [py_dep, cysignals, gd, gmp, m4ri, png, numpy],
8378
)
8479
endforeach
@@ -95,12 +90,7 @@ foreach name, pyx : extension_data_cpp
9590
subdir: 'sage/modules',
9691
install: true,
9792
override_options: ['cython_language=cpp'],
98-
include_directories: [
99-
inc_cpython,
100-
inc_ext,
101-
inc_rings,
102-
inc_rings_finite,
103-
],
93+
include_directories: [inc_cpython, inc_ext, inc_rings, inc_rings_finite],
10494
dependencies: [py_dep, cysignals, gd, gmp, m4ri, png, numpy],
10595
)
10696
endforeach

src/sage/rings/polynomial/pbori/meson.build

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
brial = cc.find_library('brial', required: false, disabler: true)
22
# Cannot be found via pkg-config
3-
brial_groebner = cc.find_library('brial_groebner', required: false, disabler: true)
3+
brial_groebner = cc.find_library(
4+
'brial_groebner',
5+
required: false,
6+
disabler: true,
7+
)
48

59
py.install_sources(
610
'PyPolyBoRi.py',

tools/update-meson.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ def remove_node(i):
289289
inplace=True,
290290
recursive=True,
291291
output=None,
292-
configuration=None,
292+
configuration=options.sourcedir / "meson.format",
293293
editor_config=None,
294294
)
295295
)

0 commit comments

Comments
 (0)