lib/utils: update library paths

lib/index/meson.build

@@ -15,22 +15,23 @@
 ## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 index_srcs=[
-	'mu-indexer.hh',
-	'mu-indexer.cc',
-	'mu-scanner.hh',
-	'mu-scanner.cc'
+        'mu-indexer.hh',
+        'mu-indexer.cc',
+        'mu-scanner.hh',
+        'mu-scanner.cc'
 ]
 
 xapian_incs = xapian_dep.get_variable(pkgconfig: 'includedir')
 lib_mu_index_inc_dep = declare_dependency(
   include_directories: include_directories(['.', '..', xapian_incs]))
 lib_mu_index=static_library('mu-index', [index_srcs],
-			    dependencies: [
-			      config_h_dep,
-			      glib_dep,
-			      lib_mu_index_inc_dep
-			    ],
-			    install: false)
+                            dependencies: [
+                              config_h_dep,
+                              glib_dep,
+                              lib_mu_utils_dep,
+                              lib_mu_index_inc_dep
+                            ],
+                            install: false)
 
 lib_mu_index_dep = declare_dependency(
   link_with: lib_mu_index

lib/message/meson.build

@@ -38,7 +38,7 @@ lib_mu_message=static_library(
 
 lib_mu_message_dep = declare_dependency(
   link_with: lib_mu_message,
-  dependencies: [ xapian_dep, gmime_dep ],
+  dependencies: [ xapian_dep, gmime_dep, lib_mu_utils_dep ],
   include_directories:
     include_directories(['.', '..']))
 

lib/utils/meson.build

@@ -33,14 +33,14 @@ lib_mu_utils=static_library('mu-utils', [
   readline_dep,
   cld2_dep
 ], include_directories:
-     include_directories(['.','..']),
+     include_directories(['.','..', '../thirdparty/']),
 install: false)
 
 lib_mu_utils_dep = declare_dependency(
   link_with: lib_mu_utils,
   compile_args: '-DFMT_HEADER_ONLY',
   include_directories:
-    include_directories(['.', '..', '../thirdparty/fmt'])
+    include_directories(['.', '..', '../thirdparty'])
 )
 
 #
@@ -80,5 +80,6 @@ test('test-lang-detector',
      executable('test-lang-detector', 'mu-lang-detector.cc',
                 install: false,
                 cpp_args: ['-DBUILD_TESTS'],
+                dependencies: [ config_h_dep, glib_dep, lib_mu_utils_dep ]))
 
 subdir('tests')

lib/utils/mu-option.hh

@@ -20,7 +20,7 @@
 #ifndef MU_OPTION__
 #define MU_OPTION__
 
-#include "thirdparty/optional.hpp"
+#include <tl/optional.hpp>
 #include <string>
 
 namespace Mu {

lib/utils/mu-result.hh

@@ -20,7 +20,7 @@
 #ifndef MU_RESULT_HH__
 #define MU_RESULT_HH__
 
-#include "thirdparty/expected.hpp"
+#include <tl/expected.hpp>
 #include "utils/mu-error.hh"
 
 namespace Mu {