minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

[meson] Use generated ftmodule.h 

ftmodule.h is generated at the root of the build directory, but FT_CONFIG_MODULES_H
(freetype/config/ftmodule.h) is used instead.
This makes the build fail when disabling modules in modules.cfg.

* meson.build (harfbuzz_dep): Add '-DFT_CONFIG_MODULES_H=<ftmodule.h>'.
This commit is contained in:
Loïc Yhuel 2022-11-14 11:36:25 +01:00
parent b37b8d2a70
commit 63ccaef07a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@ -52,6 +52,8 @@ ft2_includes = include_directories('include')
freetype_includedir = join_paths(get_option('includedir'), 'freetype2')
ft2_defines = []
# Generate a custom `ftmodule.h` version based on the content of
# `modules.cfg`.
@ -64,6 +66,7 @@ ftmodule_h = custom_target('ftmodule.h',
install_dir: join_paths(freetype_includedir, 'freetype/config'),
)
ft2_sources = [ftmodule_h]
ft2_defines += ['-DFT_CONFIG_MODULES_H=<ftmodule.h>']
# FreeType 2 modules.
@ -187,7 +190,7 @@ ft2_config_headers = files([
'include/freetype/config/public-macros.h',
])
ft2_defines = ['-DFT2_BUILD_LIBRARY=1']
ft2_defines += ['-DFT2_BUILD_LIBRARY=1']
# System support file.