diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-03-12 17:03:03 +0100 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-03-12 17:03:03 +0100 |
| commit | 3ec8bdad019572c518d2fee17040b46a161d6f40 (patch) | |
| tree | 21641a0e1a9c3c652baa3b17b00ef4035f74dd9c /tools | |
| parent | c0e5395a1bc40b3e12b3bc3bbd5fae7d81f8029f (diff) | |
| download | glibmm-3ec8bdad019572c518d2fee17040b46a161d6f40.tar.gz | |
Meson build: Make it possible to use glibmm as a subproject
glib and sigc++ can be subprojects of glibmm.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/extra_defs_gen/meson.build | 16 | ||||
| -rw-r--r-- | tools/meson.build | 3 |
2 files changed, 17 insertions, 2 deletions
diff --git a/tools/extra_defs_gen/meson.build b/tools/extra_defs_gen/meson.build index 0cc3cfba..df4ca5a2 100644 --- a/tools/extra_defs_gen/meson.build +++ b/tools/extra_defs_gen/meson.build @@ -2,7 +2,7 @@ # Input: glibmm_build_dep, giomm_build_dep, glibmm_api_version, # glibmm_libversion, glibmm_pcname, msvc14x_toolset_ver, -# macos_darwin_versions +# macos_darwin_versions, handle_built_files_py, project_build_root # Output: - glibmm_generate_extra_defs_library = library( @@ -15,6 +15,20 @@ glibmm_generate_extra_defs_library = library( install: true, ) +if meson.is_subproject() + glibmm_generate_extra_defs_dep = declare_dependency( + link_with: glibmm_generate_extra_defs_library, + ) + + # Copy the header file to a place where a main project can find it. + run_command( + python3, handle_built_files_py, 'copy_built_files', + meson.current_source_dir(), + project_build_root / 'glib' / 'glibmm_generate_extra_defs', + 'generate_extra_defs.h', + ) +endif + install_headers('generate_extra_defs.h', subdir: glibmm_pcname / 'glibmm_generate_extra_defs') executable('generate_defs_glib', 'generate_defs_glib.cc', diff --git a/tools/meson.build b/tools/meson.build index ed7443dd..370c8f3f 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -1,7 +1,8 @@ # tools # Input: perl, m4, install_prefix, install_libdir, glibmm_pcname -# Output: install_procdir, m4_files, pm_files, gmmproc, generate_wrap_init_pl +# Output: install_procdir, m4_basefiles, m4_files, pm_basefiles, pm_files, +# gmmproc_conf_data, gmmproc, generate_wrap_init_pl subdir('extra_defs_gen') |