mirror of https://github.com/djcb/mu.git
lib/utils: update library paths
This commit is contained in:
parent
4920b56671
commit
aed1395c53
|
@ -15,22 +15,23 @@
|
||||||
## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
index_srcs=[
|
index_srcs=[
|
||||||
'mu-indexer.hh',
|
'mu-indexer.hh',
|
||||||
'mu-indexer.cc',
|
'mu-indexer.cc',
|
||||||
'mu-scanner.hh',
|
'mu-scanner.hh',
|
||||||
'mu-scanner.cc'
|
'mu-scanner.cc'
|
||||||
]
|
]
|
||||||
|
|
||||||
xapian_incs = xapian_dep.get_variable(pkgconfig: 'includedir')
|
xapian_incs = xapian_dep.get_variable(pkgconfig: 'includedir')
|
||||||
lib_mu_index_inc_dep = declare_dependency(
|
lib_mu_index_inc_dep = declare_dependency(
|
||||||
include_directories: include_directories(['.', '..', xapian_incs]))
|
include_directories: include_directories(['.', '..', xapian_incs]))
|
||||||
lib_mu_index=static_library('mu-index', [index_srcs],
|
lib_mu_index=static_library('mu-index', [index_srcs],
|
||||||
dependencies: [
|
dependencies: [
|
||||||
config_h_dep,
|
config_h_dep,
|
||||||
glib_dep,
|
glib_dep,
|
||||||
lib_mu_index_inc_dep
|
lib_mu_utils_dep,
|
||||||
],
|
lib_mu_index_inc_dep
|
||||||
install: false)
|
],
|
||||||
|
install: false)
|
||||||
|
|
||||||
lib_mu_index_dep = declare_dependency(
|
lib_mu_index_dep = declare_dependency(
|
||||||
link_with: lib_mu_index
|
link_with: lib_mu_index
|
||||||
|
|
|
@ -38,7 +38,7 @@ lib_mu_message=static_library(
|
||||||
|
|
||||||
lib_mu_message_dep = declare_dependency(
|
lib_mu_message_dep = declare_dependency(
|
||||||
link_with: lib_mu_message,
|
link_with: lib_mu_message,
|
||||||
dependencies: [ xapian_dep, gmime_dep ],
|
dependencies: [ xapian_dep, gmime_dep, lib_mu_utils_dep ],
|
||||||
include_directories:
|
include_directories:
|
||||||
include_directories(['.', '..']))
|
include_directories(['.', '..']))
|
||||||
|
|
||||||
|
|
|
@ -33,14 +33,14 @@ lib_mu_utils=static_library('mu-utils', [
|
||||||
readline_dep,
|
readline_dep,
|
||||||
cld2_dep
|
cld2_dep
|
||||||
], include_directories:
|
], include_directories:
|
||||||
include_directories(['.','..']),
|
include_directories(['.','..', '../thirdparty/']),
|
||||||
install: false)
|
install: false)
|
||||||
|
|
||||||
lib_mu_utils_dep = declare_dependency(
|
lib_mu_utils_dep = declare_dependency(
|
||||||
link_with: lib_mu_utils,
|
link_with: lib_mu_utils,
|
||||||
compile_args: '-DFMT_HEADER_ONLY',
|
compile_args: '-DFMT_HEADER_ONLY',
|
||||||
include_directories:
|
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',
|
executable('test-lang-detector', 'mu-lang-detector.cc',
|
||||||
install: false,
|
install: false,
|
||||||
cpp_args: ['-DBUILD_TESTS'],
|
cpp_args: ['-DBUILD_TESTS'],
|
||||||
|
dependencies: [ config_h_dep, glib_dep, lib_mu_utils_dep ]))
|
||||||
|
|
||||||
subdir('tests')
|
subdir('tests')
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
#ifndef MU_OPTION__
|
#ifndef MU_OPTION__
|
||||||
#define MU_OPTION__
|
#define MU_OPTION__
|
||||||
|
|
||||||
#include "thirdparty/optional.hpp"
|
#include <tl/optional.hpp>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
namespace Mu {
|
namespace Mu {
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
#ifndef MU_RESULT_HH__
|
#ifndef MU_RESULT_HH__
|
||||||
#define MU_RESULT_HH__
|
#define MU_RESULT_HH__
|
||||||
|
|
||||||
#include "thirdparty/expected.hpp"
|
#include <tl/expected.hpp>
|
||||||
#include "utils/mu-error.hh"
|
#include "utils/mu-error.hh"
|
||||||
|
|
||||||
namespace Mu {
|
namespace Mu {
|
||||||
|
|
Loading…
Reference in New Issue