diff options
author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-04-04 13:22:27 +0200 |
---|---|---|
committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-04-04 13:22:27 +0200 |
commit | 980d400b893f91a1ee3fc50a644bf301bd510ade (patch) | |
tree | 201df1a224e365173a0fa6bbcbffe4ce01b206a7 | |
parent | 5461f51e1f2e8ba55615c233ca41efa16da04005 (diff) | |
download | mm-common-980d400b893f91a1ee3fc50a644bf301bd510ade.tar.gz |
skeletonmm: Update Meson build files
Add "implicit_include_directories: false" to library() and executable().
Don't use the deprecated dep.get_pkgconfig_variable() function.
Change dependencies: glibmm-2.4 -> glibmm-2.68, sigc++-2.0 -> sigc++-3.0.
-rw-r--r-- | skeletonmm/doc/reference/meson.build | 14 | ||||
-rw-r--r-- | skeletonmm/examples/meson.build | 1 | ||||
-rw-r--r-- | skeletonmm/meson.build | 12 | ||||
-rw-r--r-- | skeletonmm/skeleton/skeletonmm/meson.build | 2 | ||||
-rw-r--r-- | skeletonmm/tests/meson.build | 1 | ||||
-rw-r--r-- | skeletonmm/tools/extra_defs_gen/meson.build | 4 |
6 files changed, 23 insertions, 11 deletions
diff --git a/skeletonmm/doc/reference/meson.build b/skeletonmm/doc/reference/meson.build index b653e6e..23662fa 100644 --- a/skeletonmm/doc/reference/meson.build +++ b/skeletonmm/doc/reference/meson.build @@ -7,17 +7,21 @@ tag_file_modules = [ 'mm-common-libstdc++', - 'sigc++-2.0', - 'glibmm-2.4', + 'sigc++-3.0', + 'glibmm-2.68', +# or: +# 'mm-common-libstdc++', +# 'sigc++-2.0', +# 'glibmm-2.4', ] doxygen_tagfiles = '' docinstall_flags = [] foreach module : tag_file_modules depmod = dependency(module, required: false) if depmod.found() - doxytagfile = depmod.get_pkgconfig_variable('doxytagfile') - htmlrefpub = depmod.get_pkgconfig_variable('htmlrefpub', default: '') - htmlrefdir = depmod.get_pkgconfig_variable('htmlrefdir', default: '') + doxytagfile = depmod.get_variable(pkgconfig: 'doxytagfile') + htmlrefpub = depmod.get_variable(pkgconfig: 'htmlrefpub', default_value: '') + htmlrefdir = depmod.get_variable(pkgconfig: 'htmlrefdir', default_value: '') if htmlrefpub == '' htmlrefpub = htmlrefdir elif htmlrefdir == '' diff --git a/skeletonmm/examples/meson.build b/skeletonmm/examples/meson.build index 69e2f0a..04375fb 100644 --- a/skeletonmm/examples/meson.build +++ b/skeletonmm/examples/meson.build @@ -28,6 +28,7 @@ foreach ex : examples exe_file = executable(ex_name, ex_sources, resources, dependencies: skeletonmm_dep, + implicit_include_directories: false, gui_app: true, build_by_default: build_examples ) diff --git a/skeletonmm/meson.build b/skeletonmm/meson.build index b3b2baa..7190ada 100644 --- a/skeletonmm/meson.build +++ b/skeletonmm/meson.build @@ -6,7 +6,7 @@ project('skeletonmm', 'cpp', default_options: [ 'cpp_std=c++17' ], - meson_version: '>= 0.50.0', # required for python3.path() + meson_version: '>= 0.51.0', # required for dep.get_variable() ) skeletonmm_api_version = '1.0' @@ -89,13 +89,15 @@ install_pkgconfigdir = install_libdir / 'pkgconfig' # skeletonmm_build_dep: Dependencies when building the skeletonmm library. # skeletonmm_dep (created in skeleton/skeletonmm/meson.build): # Dependencies when using the skeletonmm library. -glibmm_req = '>= 2.62.0' +glibmm_req = '>= 2.68.0' # E.g. >= 2.66.0 if the dependency is glibmm-2.4 skeleton_req = '>= 1.0.0' -glibmm_dep = dependency('glibmm-2.4', version: glibmm_req) +glibmm_dep = dependency('glibmm-2.68', version: glibmm_req) +# or: glibmm_dep = dependency('glibmm-2.4', version: glibmm_req) skeleton_dep = dependency('skeleton-1.0', version: skeleton_req) skeletonmm_build_dep = [glibmm_dep, skeleton_dep] skeletonmm_requires = ' '.join([ - 'glibmm-2.4', glibmm_req, + 'glibmm-2.68', glibmm_req, +# or: 'glibmm-2.4', glibmm_req, 'skeleton-1.0', skeleton_req, ]) gnome = import('gnome') @@ -113,7 +115,7 @@ dot = find_program('dot', required: build_documentation) # Used by Doxygen xsltproc = find_program('xsltproc', required: build_documentation) # Where to find gmmproc and generate_wrap_init.pl. -gmmproc_dir = glibmm_dep.get_pkgconfig_variable('gmmprocdir') +gmmproc_dir = glibmm_dep.get_variable(pkgconfig: 'gmmprocdir') # Script files copied to 'untracked' by mm-common-get. script_dir = project_source_root / 'untracked' / 'build_scripts' diff --git a/skeletonmm/skeleton/skeletonmm/meson.build b/skeletonmm/skeleton/skeletonmm/meson.build index 1c6409e..2a424a7 100644 --- a/skeletonmm/skeleton/skeletonmm/meson.build +++ b/skeletonmm/skeleton/skeletonmm/meson.build @@ -98,6 +98,7 @@ if maintainer_mode built_cc_file_targets, built_h_file_targets, extra_cc_files, version: skeletonmm_libversion, darwin_versions: macos_darwin_versions, + implicit_include_directories: false, include_directories: extra_include_dirs, dependencies: skeletonmm_build_dep, install: true, @@ -140,6 +141,7 @@ else # not maintainer_mode built_cc_files, extra_cc_files, version: skeletonmm_libversion, darwin_versions: macos_darwin_versions, + implicit_include_directories: false, include_directories: extra_include_dirs, dependencies: skeletonmm_build_dep, install: true, diff --git a/skeletonmm/tests/meson.build b/skeletonmm/tests/meson.build index 68dcdd1..c0c6864 100644 --- a/skeletonmm/tests/meson.build +++ b/skeletonmm/tests/meson.build @@ -29,6 +29,7 @@ foreach ex : tests exe_file = executable(ex_name, ex_sources, resources, dependencies: skeletonmm_dep, + implicit_include_directories: false, gui_app: false, build_by_default: true ) diff --git a/skeletonmm/tools/extra_defs_gen/meson.build b/skeletonmm/tools/extra_defs_gen/meson.build index 69f3b16..05d0b5e 100644 --- a/skeletonmm/tools/extra_defs_gen/meson.build +++ b/skeletonmm/tools/extra_defs_gen/meson.build @@ -4,11 +4,13 @@ # Output: m4_files, install_m4dir glibmm_generate_extra_defs_dep = cpp_compiler.find_library( - 'glibmm_generate_extra_defs-2.4', + 'glibmm_generate_extra_defs-2.68', +# or: 'glibmm_generate_extra_defs-2.4', ) executable('generate_defs_skeleton', 'generate_defs_skeleton.cc', dependencies: [skeletonmm_build_dep, glibmm_generate_extra_defs_dep], + implicit_include_directories: false, install: false, ) |