diff options
| author | Loïc Yhuel <loic.yhuel@softathome.com> | 2022-11-14 11:36:25 +0100 |
|---|---|---|
| committer | Loïc Yhuel <loic.yhuel@softathome.com> | 2022-11-14 14:43:04 +0100 |
| commit | 63ccaef07a048db66e7ac66ee241fb3d7751736f (patch) | |
| tree | 699473ba238afca86e53698a2faed20ed10fe41a | |
| parent | b37b8d2a70b967bac95745898f8d9a2d7ff6ac7f (diff) | |
| download | freetype2-63ccaef07a048db66e7ac66ee241fb3d7751736f.tar.gz | |
[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>'.
| -rw-r--r-- | meson.build | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 41822bc2b..03c1534bd 100644 --- a/meson.build +++ b/meson.build @@ -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. |