| ... |
... |
@@ -49,6 +49,7 @@ ft2_pkgconfig_version = run_command(python_exe, |
|
49
|
49
|
|
|
50
|
50
|
ft2_includes = include_directories('include')
|
|
51
|
51
|
|
|
|
52
|
+freetype_includedir = join_paths(get_option('includedir'), 'freetype2')
|
|
52
|
53
|
|
|
53
|
54
|
# Generate a custom `ftmodule.h` version based on the content of
|
|
54
|
55
|
# `modules.cfg`.
|
| ... |
... |
@@ -59,7 +60,7 @@ ftmodule_h = custom_target('ftmodule.h', |
|
59
|
60
|
command: [python_exe, files('builds/meson/parse_modules_cfg.py'),
|
|
60
|
61
|
'--format=ftmodule.h', '@INPUT@', '--output', '@OUTPUT@'],
|
|
61
|
62
|
install: true,
|
|
62
|
|
- install_dir: 'include/freetype2/freetype/config',
|
|
|
63
|
+ install_dir: join_paths(freetype_includedir, 'freetype/config'),
|
|
63
|
64
|
)
|
|
64
|
65
|
ft2_sources = [ftmodule_h]
|
|
65
|
66
|
|
| ... |
... |
@@ -303,7 +304,7 @@ ftoption_h = custom_target('ftoption.h', |
|
303
|
304
|
output: 'ftoption.h',
|
|
304
|
305
|
command: ftoption_command,
|
|
305
|
306
|
install: true,
|
|
306
|
|
- install_dir: 'include/freetype2/freetype/config',
|
|
|
307
|
+ install_dir: join_paths(freetype_includedir, 'freetype/config'),
|
|
307
|
308
|
)
|
|
308
|
309
|
ft2_sources += ftoption_h
|
|
309
|
310
|
ft2_defines += ['-DFT_CONFIG_OPTIONS_H=<ftoption.h>']
|
| ... |
... |
@@ -330,7 +331,7 @@ if use_unix_ftsystem_c |
|
330
|
331
|
output: 'ftconfig.h',
|
|
331
|
332
|
command: ftconfig_command,
|
|
332
|
333
|
install: true,
|
|
333
|
|
- install_dir: 'include/freetype2/freetype/config',
|
|
|
334
|
+ install_dir: join_paths(freetype_includedir, 'freetype/config'),
|
|
334
|
335
|
)
|
|
335
|
336
|
ft2_sources += ftconfig_h
|
|
336
|
337
|
ft2_defines += ['-DFT_CONFIG_CONFIG_H=<ftconfig.h>']
|
| ... |
... |
@@ -361,11 +362,11 @@ meson.override_dependency('freetype2', freetype_dep) |
|
361
|
362
|
# i.e., the subdir value seems to be ignored, contrary to examples in the
|
|
362
|
363
|
# Meson documentation.
|
|
363
|
364
|
install_headers('include/ft2build.h',
|
|
364
|
|
- install_dir: 'include/freetype2')
|
|
|
365
|
+ install_dir: freetype_includedir)
|
|
365
|
366
|
install_headers(ft2_public_headers,
|
|
366
|
|
- install_dir: 'include/freetype2/freetype')
|
|
|
367
|
+ install_dir: join_paths(freetype_includedir, 'freetype'))
|
|
367
|
368
|
install_headers(ft2_config_headers,
|
|
368
|
|
- install_dir: 'include/freetype2/freetype/config')
|
|
|
369
|
+ install_dir: join_paths(freetype_includedir, 'freetype/config'))
|
|
369
|
370
|
|
|
370
|
371
|
|
|
371
|
372
|
pkgconfig = import('pkgconfig')
|