[libcamera-devel,v8,2/7] meson: use new project_*_root() functions

15813 diff mbox series

diff --git a/Documentation/meson.build b/Documentation/meson.build
index 33af82aa..8e2eacc6 100644
--- a/Documentation/meson.build
+++ b/Documentation/meson.build
@@ -12,8 +12,8 @@  dot = find_program('dot', required : get_option('documentation'))
 if doxygen.found() and dot.found()
     cdata = configuration_data()
     cdata.set('VERSION', 'v@0@'.format(libcamera_git_version))
-    cdata.set('TOP_SRCDIR', meson.source_root())
-    cdata.set('TOP_BUILDDIR', meson.build_root())
+    cdata.set('TOP_SRCDIR', meson.project_source_root())
+    cdata.set('TOP_BUILDDIR', meson.project_build_root())
 
     doxyfile = configure_file(input : 'Doxyfile.in',
                               output : 'Doxyfile',
diff --git a/include/libcamera/ipa/meson.build b/include/libcamera/ipa/meson.build
index 6ea94fb5..442ca3dd 100644
--- a/include/libcamera/ipa/meson.build
+++ b/include/libcamera/ipa/meson.build
@@ -25,8 +25,8 @@  ipa_mojom_core = custom_target(core_mojom_file.split('.')[0] + '_mojom_module',
                                output : core_mojom_file + '-module',
                                command : [
                                    mojom_parser,
-                                   '--output-root', meson.build_root(),
-                                   '--input-root', meson.source_root(),
+                                   '--output-root', meson.project_build_root(),
+                                   '--input-root', meson.project_source_root(),
                                    '--mojoms', '@INPUT@'
                                ])
 
@@ -89,8 +89,8 @@  foreach file : ipa_mojom_files
                           depends : ipa_mojom_core,
                           command : [
                               mojom_parser,
-                              '--output-root', meson.build_root(),
-                              '--input-root', meson.source_root(),
+                              '--output-root', meson.project_build_root(),
+                              '--input-root', meson.project_source_root(),
                               '--mojoms', '@INPUT@'
                           ])
 
diff --git a/meson.build b/meson.build
index b892ba84..10ad8c5c 100644
--- a/meson.build
+++ b/meson.build
@@ -17,8 +17,8 @@  project('libcamera', 'c', 'cpp',
 # git version tag, the build metadata (e.g. +211-c94a24f4) is omitted from
 # libcamera_git_version.
 libcamera_git_version = run_command('utils/gen-version.sh',
-                                    meson.build_root(),
-                                    meson.source_root()).stdout().strip()
+                                    meson.project_build_root(),
+                                    meson.project_source_root()).stdout().strip()
 if libcamera_git_version == ''
     libcamera_git_version = meson.project_version()
 endif
@@ -160,7 +160,7 @@  endif
 # Create a symlink from the build root to the source root. This is used when
 # running libcamera from the build directory to locate resources in the source
 # directory (such as IPA configuration files).
-run_command('ln', '-fsT', meson.source_root(), meson.build_root() / 'source')
+run_command('ln', '-fsT', meson.project_source_root(), meson.project_build_root() / 'source')
 
 configure_file(output : 'config.h', configuration : config_h)
 
diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index 26912ca1..d6a78760 100644
--- a/src/libcamera/meson.build
+++ b/src/libcamera/meson.build
@@ -98,11 +98,11 @@  endforeach
 
 libcamera_sources += control_sources
 
-gen_version = meson.source_root() / 'utils' / 'gen-version.sh'
+gen_version = meson.project_source_root() / 'utils' / 'gen-version.sh'
 
 # Use vcs_tag() and not configure_file() or run_command(), to ensure that the
 # version gets updated with every ninja build and not just at meson setup time.
-version_cpp = vcs_tag(command : [gen_version, meson.build_root(), meson.source_root()],
+version_cpp = vcs_tag(command : [gen_version, meson.project_build_root(), meson.project_source_root()],
                       input : 'version.cpp.in',
                       output : 'version.cpp',
                       fallback : meson.project_version())
diff --git a/test/serialization/generated_serializer/include/libcamera/ipa/meson.build b/test/serialization/generated_serializer/include/libcamera/ipa/meson.build
index ba198f7a..6f8794c1 100644
--- a/test/serialization/generated_serializer/include/libcamera/ipa/meson.build
+++ b/test/serialization/generated_serializer/include/libcamera/ipa/meson.build
@@ -6,8 +6,8 @@  mojom = custom_target('test_mojom_module',
                       output : 'test.mojom-module',
                       command : [
                           mojom_parser,
-                          '--output-root', meson.build_root(),
-                          '--input-root', meson.source_root(),
+                          '--output-root', meson.project_build_root(),
+                          '--input-root', meson.project_source_root(),
                           '--mojoms', '@INPUT@'
                       ])