[meson] Remove `default_library=both` from `default_options`.
It is inconsistent with what all other Meson projects do. It also prevents static linking to FreeType when it is a subproject because `default_options` in a subproject takes precedence on values set on the main project. For example, building 'GStreamer' with `-Ddefault_library=static` would still dynamically link on FreeType unless the user also sets `-Dfreetype2:default_library=static`. * meson.build: Updated. * .gitlab-ci.yml: Retain `both` option for testing.
This commit is contained in:
parent
079a22da03
commit
d59c7ce1b9
|
@ -5,7 +5,7 @@ stages:
|
||||||
|
|
||||||
# FIXME: Use --werror once warnings are fixed.
|
# FIXME: Use --werror once warnings are fixed.
|
||||||
variables:
|
variables:
|
||||||
MESON_ARGS: --fatal-meson-warnings
|
MESON_ARGS: --fatal-meson-warnings --default-library=both
|
||||||
MESON_ARGS_WINDOWS: ${MESON_ARGS} --force-fallback-for=zlib
|
MESON_ARGS_WINDOWS: ${MESON_ARGS} --force-fallback-for=zlib
|
||||||
|
|
||||||
.build windows common:
|
.build windows common:
|
||||||
|
@ -147,7 +147,8 @@ linux autotools libs clang:
|
||||||
linux meson:
|
linux meson:
|
||||||
extends: '.build linux common'
|
extends: '.build linux common'
|
||||||
script: |
|
script: |
|
||||||
meson setup build -Dbrotli=disabled \
|
meson setup build ${MESON_ARGS} \
|
||||||
|
-Dbrotli=disabled \
|
||||||
-Dbzip2=disabled \
|
-Dbzip2=disabled \
|
||||||
-Dharfbuzz=disabled \
|
-Dharfbuzz=disabled \
|
||||||
-Dpng=disabled \
|
-Dpng=disabled \
|
||||||
|
@ -159,7 +160,8 @@ linux meson:
|
||||||
linux meson libs:
|
linux meson libs:
|
||||||
extends: '.build linux common'
|
extends: '.build linux common'
|
||||||
script: |
|
script: |
|
||||||
meson setup build -Dbrotli=enabled \
|
meson setup build ${MESON_ARGS} \
|
||||||
|
-Dbrotli=enabled \
|
||||||
-Dbzip2=enabled \
|
-Dbzip2=enabled \
|
||||||
-Dharfbuzz=disabled \
|
-Dharfbuzz=disabled \
|
||||||
-Dpng=disabled \
|
-Dpng=disabled \
|
||||||
|
@ -223,6 +225,6 @@ macos meson:
|
||||||
- pip3 install --upgrade certifi
|
- pip3 install --upgrade certifi
|
||||||
- pip3 install -U ninja
|
- pip3 install -U ninja
|
||||||
|
|
||||||
- meson setup build
|
- meson setup build ${MESON_ARGS}
|
||||||
- meson compile --verbose -C build
|
- meson compile --verbose -C build
|
||||||
- sudo meson install -C build
|
- sudo meson install -C build
|
||||||
|
|
|
@ -25,7 +25,6 @@
|
||||||
|
|
||||||
project('freetype2', 'c',
|
project('freetype2', 'c',
|
||||||
meson_version: '>= 0.55.0',
|
meson_version: '>= 0.55.0',
|
||||||
default_options: ['default_library=both'],
|
|
||||||
version: run_command('builds/meson/extract_freetype_version.py',
|
version: run_command('builds/meson/extract_freetype_version.py',
|
||||||
'include/freetype/freetype.h',
|
'include/freetype/freetype.h',
|
||||||
check: true).stdout().strip(),
|
check: true).stdout().strip(),
|
||||||
|
|
Loading…
Reference in New Issue