[tracker/wip/carlosg/meson-fixes: 3/10] build: Do not use meson.source_root()



commit a003d7979db6f89505fbdf9c56f2ad01a86af713
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue Sep 4 21:08:05 2018 +0200

    build: Do not use meson.source_root()
    
    As advisded in the meson porting wiki page.

 tests/libtracker-data/meson.build  | 2 +-
 tests/libtracker-miner/meson.build | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/tests/libtracker-data/meson.build b/tests/libtracker-data/meson.build
index 788c4dffd..37719cd1a 100644
--- a/tests/libtracker-data/meson.build
+++ b/tests/libtracker-data/meson.build
@@ -12,7 +12,7 @@ libtracker_data_slow_tests = [
 ]
 
 libtracker_data_test_environment = environment()
-libtracker_data_test_environment.set('TRACKER_LANGUAGE_STOP_WORDS_DIR', 
'@0@/src/libtracker-common/stop-words'.format(meson.source_root()))
+libtracker_data_test_environment.set('TRACKER_LANGUAGE_STOP_WORDS_DIR', 
'@0@/src/libtracker-common/stop-words'.format(source_root))
 
 libtracker_data_test_deps = [tracker_common_dep, tracker_data_dep]
 
diff --git a/tests/libtracker-miner/meson.build b/tests/libtracker-miner/meson.build
index f4cb1bdad..d5f21136b 100644
--- a/tests/libtracker-miner/meson.build
+++ b/tests/libtracker-miner/meson.build
@@ -19,11 +19,11 @@ libtracker_miner_test_c_args = [
   '-DTEST',
   '-DTEST_DATA_DIR="@0@/data"'.format(meson.current_source_dir()),
   '-DTEST_MINERS_DIR="@0@/mock-miners"'.format(meson.current_source_dir()),
-  '-DTEST_ONTOLOGIES_DIR="@0@/src/ontologies/nepomuk"'.format(meson.source_root()),
+  '-DTEST_ONTOLOGIES_DIR="@0@/src/ontologies/nepomuk"'.format(source_root),
 ]
 
 libtracker_miner_test_environment = environment()
-libtracker_miner_test_environment.set('TRACKER_LANGUAGE_STOP_WORDS_DIR', 
'@0@/src/libtracker-common/stop-words'.format(meson.source_root()))
+libtracker_miner_test_environment.set('TRACKER_LANGUAGE_STOP_WORDS_DIR', 
'@0@/src/libtracker-common/stop-words'.format(source_root))
 
 libtracker_miner_test_deps = [tracker_common_dep, tracker_miner_dep, tracker_sparql_dep]
 


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