Meson build: Use Meson's pkgconfig module

kjellahl · kjellahl · commit b9ffaef1464a · 2024-07-19T15:51:16.000+02:00
instead of using the *.pc.in templates.
Require meson &gt;= 0.62. Remove the can_add_dist_script variable.
It's unnecessary when the meson version &gt;= 0.58.
Simplify the calls to dependency().get_variable().
diff --git a/MSVC_NMake/meson.build b/MSVC_NMake/meson.build
@@ -1,7 +1,6 @@
 # MSVC_NMake
 
-# Input: pkg_conf_data, sigcxxconfig_h_meson, project_build_root, python3,
-#        can_add_dist_script
+# Input: pkg_conf_data, sigcxxconfig_h_meson, project_build_root, python3
 # Output: sigc_rc
 
 sigc_rc = configure_file(
@@ -20,13 +19,11 @@ configure_file(
 untracked_msvc_nmake = 'untracked' / 'MSVC_NMake'
 handle_built_files = project_source_root / 'tools' / 'handle-built-files.py'
 
-if can_add_dist_script
-  # Distribute built files.
-  meson.add_dist_script(
-    python3, handle_built_files, 'dist_gen_msvc_files',
-    meson.current_build_dir(),
-    untracked_msvc_nmake,
-    project_build_root / 'sigc++config.h',
-    meson.current_build_dir() / 'sigc.rc',
-  )
-endif
+# Distribute built files.
+meson.add_dist_script(
+  python3, handle_built_files, 'dist_gen_msvc_files',
+  meson.current_build_dir(),
+  untracked_msvc_nmake,
+  project_build_root / 'sigc++config.h',
+  meson.current_build_dir() / 'sigc.rc',
+)
diff --git a/docs/docs/manual/meson.build b/docs/docs/manual/meson.build
@@ -1,7 +1,7 @@
 # docs/docs/manual
 
 # input: install_datadir, sigcxx_pcname, tutorial_custom_cmd, python3,
-#        build_documentation, book_name, can_add_dist_script, xsltproc
+#        build_documentation, book_name, xsltproc
 # output: can_parse_and_validate, build_pdf_by_default, can_build_pdf,
 #         install_tutorialdir, build_manual_opt, build_manual
 
@@ -95,13 +95,11 @@ if can_build_pdf
   )
 endif
 
-if can_add_dist_script
-  # Distribute built files.
-  meson.add_dist_script(
-    python3, tutorial_custom_cmd, 'dist_doc',
-    doc_dist_dir,
-    meson.current_build_dir(),
-    meson.current_source_dir() / sigc_manual_xml,
-    meson.current_build_dir() / sigc_manual_pdf,
-  )
-endif
+# Distribute built files.
+meson.add_dist_script(
+  python3, tutorial_custom_cmd, 'dist_doc',
+  doc_dist_dir,
+  meson.current_build_dir(),
+  meson.current_source_dir() / sigc_manual_xml,
+  meson.current_build_dir() / sigc_manual_pdf,
+)
diff --git a/docs/docs/reference/meson.build b/docs/docs/reference/meson.build
@@ -2,8 +2,7 @@
 
 # Input: project_build_root, project_source_root, sigcxx_pcname,
 #        sigcxx_api_version, build_documentation, source_h_files,
-#        hg_ccg_basenames, install_datadir, python3, doc_reference,
-#        can_add_dist_script, dot
+#        hg_ccg_basenames, install_datadir, python3, doc_reference, dot
 # Output: install_docdir, install_devhelpdir, book_name,
 #         if build_documentation: tag_file
 
@@ -18,7 +17,7 @@ docinstall_flags = []
 foreach module : tag_file_modules
   depmod = dependency(module, required: false)
   if depmod.found()
-    doxytagfile = depmod.get_variable(pkgconfig: 'doxytagfile', internal: 'doxytagfile', default_value: '')
+    doxytagfile = depmod.get_variable('doxytagfile', default_value: '')
     if doxytagfile != ''
       if depmod.type_name() == 'internal'
         # Subprojects must build their tag files before doxygen is called.
@@ -28,8 +27,8 @@ foreach module : tag_file_modules
           doxygen_tag_targets += subproject(module).get_variable('global_tag_file_target')
         endif
       endif
-      htmlrefpub = depmod.get_variable(pkgconfig: 'htmlrefpub', internal: 'htmlrefpub', default_value: '')
-      htmlrefdir = depmod.get_variable(pkgconfig: 'htmlrefdir', internal: 'htmlrefdir', default_value: '')
+      htmlrefpub = depmod.get_variable('htmlrefpub', default_value: '')
+      htmlrefdir = depmod.get_variable('htmlrefdir', default_value: '')
       if htmlrefpub == ''
         htmlrefpub = htmlrefdir
       elif htmlrefdir == ''
@@ -129,14 +128,12 @@ meson.add_install_script(
   docinstall_flags
 )
 
-if can_add_dist_script
-  # Distribute built files and files copied by mm-common-get.
-  meson.add_dist_script(
-    python3, doc_reference, 'dist_doc',
-    doctool_dir,
-    doctool_dist_dir,
-    meson.current_build_dir(),
-    tag_file.full_path(),
-    devhelp_file.full_path(),
-  )
-endif
+# Distribute built files and files copied by mm-common-get.
+meson.add_dist_script(
+  python3, doc_reference, 'dist_doc',
+  doctool_dir,
+  doctool_dist_dir,
+  meson.current_build_dir(),
+  tag_file.full_path(),
+  devhelp_file.full_path(),
+)
diff --git a/meson.build b/meson.build
@@ -7,8 +7,7 @@ project('libsigc++', 'cpp',
     'cpp_std=c++17',
     'warning_level=1',
   ],
-  meson_version: '>= 0.55.0', # required for meson.add_dist_script(python3, ...)
-                              # and meson.add_install_script(python3, ...)
+  meson_version: '>= 0.62.0', # required for variables in pkgconfig.generate()
 )
 
 sigcxx_api_version = '3.0'
@@ -204,6 +203,7 @@ add_project_arguments(warning_flags, language: 'cpp')
 # MSVC: Ignore warnings that aren't really harmful, but make those
 #       that should not be overlooked stand out.
 static_cxxflag = '-DLIBSIGCXX_STATIC'
+msvc_static_cxxflag = is_msvc_static ? static_cxxflag : ''
 if is_msvc
   disable_warnings_list = [
     '/EHsc',  # avoid warnings caused by exception handling model used
@@ -234,13 +234,6 @@ endif
 
 # Configure files
 pkg_conf_data = configuration_data()
-pkg_conf_data.set('prefix', install_prefix)
-pkg_conf_data.set('exec_prefix', '${prefix}')
-pkg_conf_data.set('libdir', '${exec_prefix}' / install_libdir)
-pkg_conf_data.set('datarootdir', '${prefix}' / install_datadir)
-pkg_conf_data.set('datadir', '${datarootdir}')
-pkg_conf_data.set('includedir', '${prefix}' / install_includedir)
-pkg_conf_data.set('top_srcdir', project_source_root)
 pkg_conf_data.set('PACKAGE_VERSION', meson.project_version())
 pkg_conf_data.set('SIGCXX_API_VERSION', sigcxx_api_version)
 
@@ -250,20 +243,6 @@ endif
 pkg_conf_data.set('SIGCXX_MAJOR_VERSION', sigcxx_major_version)
 pkg_conf_data.set('SIGCXX_MINOR_VERSION', sigcxx_minor_version)
 pkg_conf_data.set('SIGCXX_MICRO_VERSION', sigcxx_micro_version)
-pkg_conf_data.set('MSVC_STATIC_CXXFLAG', is_msvc_static ? static_cxxflag : '')
-
-configure_file(
-  input: 'sigc++.pc.in',
-  output: sigcxx_pcname + '.pc',
-  configuration: pkg_conf_data,
-  install_dir: install_pkgconfigdir,
-)
-
-configure_file(
-  input: 'sigc++-uninstalled.pc.in',
-  output: sigcxx_pcname + '-uninstalled.pc',
-  configuration: pkg_conf_data,
-)
 
 sigcxxconfig_h_meson = files('sigc++config.h.meson')
 install_includeconfigdir = install_libdir / sigcxx_pcname / 'include'
@@ -274,9 +253,6 @@ configure_file(
   install_dir: install_includeconfigdir,
 )
 
-# add_dist_script() is not allowed in a subproject if meson.version() < 0.58.0.
-can_add_dist_script = not meson.is_subproject() or meson.version().version_compare('>= 0.58.0')
-
 #subdir('cmake')
 subdir('MSVC_NMake')
 subdir('sigc++')
@@ -285,25 +261,23 @@ subdir('tests')
 subdir('docs/docs/reference')
 subdir('docs/docs/manual')
 
-if can_add_dist_script
-  # Add a ChangeLog file to the distribution directory.
-  meson.add_dist_script(
-    python3, dist_changelog,
-    project_source_root,
-  )
-  # Don't distribute these files and directories.
-  dont_distribute = [
-    '.github',
-  ]
-  # Add build scripts to the distribution directory, and delete .gitignore
-  # files and an empty $MESON_PROJECT_DIST_ROOT/build/ directory.
-  meson.add_dist_script(
-    python3, dist_build_scripts,
-    project_source_root,
-    'untracked' / 'build_scripts',
-    dont_distribute,
-  )
-endif
+# Add a ChangeLog file to the distribution directory.
+meson.add_dist_script(
+  python3, dist_changelog,
+  project_source_root,
+)
+# Don't distribute these files and directories.
+dont_distribute = [
+  '.github',
+]
+# Add build scripts to the distribution directory, and delete .gitignore
+# files and an empty $MESON_PROJECT_DIST_ROOT/build/ directory.
+meson.add_dist_script(
+  python3, dist_build_scripts,
+  project_source_root,
+  'untracked' / 'build_scripts',
+  dont_distribute,
+)
 
 if meson.is_subproject()
   pkgconfig_vars = {
diff --git a/sigc++/meson.build b/sigc++/meson.build
@@ -1,7 +1,7 @@
 # sigc++
 
 # Input: sigcxx_build_dep, sigcxx_pcname, sigcxx_libversion, sigcxx_api_version,
-#        darwin_versions, install_includedir, sig_rc
+#        darwin_versions, install_includedir, sig_rc, msvc_static_cxxflag
 # Output: source_h_files, sigcxx_own_dep
 
 # There are no built source files in libsigc++-3.0.
@@ -101,6 +101,36 @@ sigcxx_library = library('sigc-' + sigcxx_api_version,
   install: true,
 )
 
+# Generate .pc files, used by pkg-config.
+pkg_config = import('pkgconfig')
+pc_common_variables = [
+  'doxytagfile=${docdir}/reference/lib' + sigcxx_pcname + '.tag',
+  'htmlrefdir=${docdir}/reference/html',
+  'htmlrefpub=https://libsigcplusplus.github.io/libsigcplusplus/reference/html',
+]
+pc_variables = [
+  'exec_prefix=${prefix}',
+  'datarootdir=${datadir}',
+  'docdir=${datadir}/doc/lib' + sigcxx_pcname,
+] + pc_common_variables
+pc_uninstalled_variables = [
+  'docdir=${prefix}/docs/docs',
+] + pc_common_variables
+
+pkg_config.generate(sigcxx_library,
+  filebase: sigcxx_pcname,
+  variables: pc_variables,
+  uninstalled_variables: pc_uninstalled_variables,
+  name: meson.project_name(),
+  description: 'Typesafe signal and callback system for C++',
+  url: 'https://libsigcplusplus.github.io/libsigcplusplus/',
+  subdirs: [sigcxx_pcname],
+  extra_cflags: [
+    '-I${libdir}/' + sigcxx_pcname + '/include',
+    msvc_static_cxxflag,
+  ],
+)
+
 # This is used when building example programs and test programs.
 # It's also a part of sigcxx_dep, when libsigc++ is a subproject.
 sigcxx_own_dep = declare_dependency(
