* meson.build: s/freetype2_dep/freetype_dep/.
Many projects (e.g., fontconfig, cairo) hardcode the `freetype_dep` variable name to use FreeType as subproject because that was the variable name in Centricular's Meson port of FreeType. While they should stop hardcoding that variable name, it does not cost us anything to keep using that name to ease transition.
This commit is contained in:
parent
3dbdb78a25
commit
cc90307d71
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
||||||
|
2021-02-09 Xavier Claessens <xavier.claessens@collabora.com>
|
||||||
|
|
||||||
|
* meson.build: s/freetype2_dep/freetype_dep/.
|
||||||
|
|
||||||
|
Many projects (e.g., fontconfig, cairo) hardcode the `freetype_dep`
|
||||||
|
variable name to use FreeType as subproject because that was the
|
||||||
|
variable name in Centricular's Meson port of FreeType. While they
|
||||||
|
should stop hardcoding that variable name, it does not cost us
|
||||||
|
anything to keep using that name to ease transition.
|
||||||
|
|
||||||
2021-02-09 Xavier Claessens <xavier.claessens@collabora.com>
|
2021-02-09 Xavier Claessens <xavier.claessens@collabora.com>
|
||||||
|
|
||||||
[meson] Fix handling of HarfBuzz library.
|
[meson] Fix handling of HarfBuzz library.
|
||||||
|
|
|
@ -327,11 +327,11 @@ ft2_lib = library('freetype',
|
||||||
|
|
||||||
|
|
||||||
# To be used by other projects including this one through subproject().
|
# To be used by other projects including this one through subproject().
|
||||||
freetype2_dep = declare_dependency(
|
freetype_dep = declare_dependency(
|
||||||
include_directories: ft2_includes,
|
include_directories: ft2_includes,
|
||||||
link_with: ft2_lib,
|
link_with: ft2_lib,
|
||||||
version: ft2_pkgconfig_version)
|
version: ft2_pkgconfig_version)
|
||||||
meson.override_dependency('freetype2', freetype2_dep)
|
meson.override_dependency('freetype2', freetype_dep)
|
||||||
|
|
||||||
|
|
||||||
# NOTE: Using both `install_dir` and `subdir` doesn't seem to work below,
|
# NOTE: Using both `install_dir` and `subdir` doesn't seem to work below,
|
||||||
|
|
Loading…
Reference in New Issue