diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-02-24 16:46:48 +0100 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-02-24 17:24:17 +0100 |
| commit | 7ac145ae178d11e1aa3aa6dd555e988cb702eec2 (patch) | |
| tree | abe3b9d7fd236d2c3993b168a8fe7d1f6ac985e0 | |
| parent | b69c0ce9c0b62cac55c09a9ea0893ccbd8ec4b64 (diff) | |
| download | glibmm-7ac145ae178d11e1aa3aa6dd555e988cb702eec2.tar.gz | |
Meson build: Use relative paths to untracked/
The paths to the source code in untracked/ shall be relative to the
meson.build file, when library files are built from a tarball.
With absolute paths Meson may generate too long file names.
See gtkmm!61
| -rw-r--r-- | gio/giomm/meson.build | 5 | ||||
| -rw-r--r-- | glib/glibmm/meson.build | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/gio/giomm/meson.build b/gio/giomm/meson.build index d11bab75..72516f56 100644 --- a/gio/giomm/meson.build +++ b/gio/giomm/meson.build @@ -209,6 +209,7 @@ install_headers('..' / 'giomm.h', subdir: giomm_pcname) install_headers(giomm_extra_h_files, subdir: giomm_pcname / 'giomm') untracked_giomm = 'untracked' / 'gio' / 'giomm' +rel_untracked_giomm = '..' / '..' / untracked_giomm src_untracked_giomm = project_source_root / untracked_giomm extra_giomm_objects = [] @@ -343,9 +344,9 @@ else # not maintainer_mode giomm_hg_ccg_basenames, ) - built_cc_files = [ src_untracked_giomm / 'wrap_init.cc' ] + built_cc_files = [ rel_untracked_giomm / 'wrap_init.cc' ] foreach file : giomm_used_hg_ccg_basenames - built_cc_files += src_untracked_giomm / file + '.cc' + built_cc_files += rel_untracked_giomm / file + '.cc' endforeach extra_include_dirs = [ '..', '..' / '..' / 'untracked' / 'gio', diff --git a/glib/glibmm/meson.build b/glib/glibmm/meson.build index b5f0612b..b1736082 100644 --- a/glib/glibmm/meson.build +++ b/glib/glibmm/meson.build @@ -144,6 +144,7 @@ install_headers(glibmm_extra_h_files, subdir: glibmm_pcname / 'glibmm') install_headers(glibmm_extra_ph_files, subdir: glibmm_pcname / 'glibmm' / 'private') untracked_glibmm = 'untracked' / 'glib' / 'glibmm' +rel_untracked_glibmm = '..' / '..' / untracked_glibmm src_untracked_glibmm = project_source_root / untracked_glibmm extra_glibmm_objects = [] @@ -301,12 +302,12 @@ else # not maintainer_mode glibmm_h_m4_files + glibmm_cc_m4_files, ) - built_cc_files = [ src_untracked_glibmm / 'wrap_init.cc' ] + built_cc_files = [ rel_untracked_glibmm / 'wrap_init.cc' ] foreach file : glibmm_hg_ccg_basenames - built_cc_files += src_untracked_glibmm / file + '.cc' + built_cc_files += rel_untracked_glibmm / file + '.cc' endforeach foreach file : glibmm_cc_m4_files - built_cc_files += src_untracked_glibmm / file + built_cc_files += rel_untracked_glibmm / file endforeach extra_include_dirs = [ '..', '..' / '..' / 'untracked' / 'glib' ] |