[libadwaita] Remove usage of meson.source/build_root()



commit 847fac220653fa38b88980474452caff0847d900
Author: Tristan Partin <tristan partin io>
Date:   Wed Oct 27 11:37:26 2021 -0500

    Remove usage of meson.source/build_root()
    
    Depending on the context, meson.project/global_source/build_root() are
    the much better options.

 meson.build     | 2 +-
 src/meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index c901d2f2..8358c18b 100644
--- a/meson.build
+++ b/meson.build
@@ -28,7 +28,7 @@ libversion = '@0@.@1@.@2@'.format(soversion, current, revision)
 add_project_arguments([
   '-DHAVE_CONFIG_H',
   '-DADWAITA_COMPILATION',
-  '-I' + meson.build_root(),
+  '-I' + meson.project_build_root(),
 ], language: 'c')
 
 root_inc = include_directories('.')
diff --git a/src/meson.build b/src/meson.build
index 1b766865..2560fe40 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -245,7 +245,7 @@ libadwaita_link_args = []
 libadwaita_symbols_file = 'libadwaita.syms'
 
 # Check linker flags
-ld_version_script_arg = '-Wl,--version-script,@0@/@1@'.format(meson.source_root(),
+ld_version_script_arg = '-Wl,--version-script,@0@/@1@'.format(meson.project_source_root(),
                                                               libadwaita_symbols_file)
 if cc.links('int main() { return 0; }', args : ld_version_script_arg, name : 'ld_supports_version_script')
   libadwaita_link_args += [ld_version_script_arg]


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]