diff --git a/src/meson.build b/src/meson.build index c982329..24a0dfa 100644 --- a/src/meson.build +++ b/src/meson.build @@ -2,6 +2,7 @@ restc_cpp_dep = dependency('restc-cpp', version: '>=0.1.1', fallback: ['restc-cpp', 'restc_cpp_dep'], default_options: [ 'restc_cpp_with_unit_tests=false', + 'restc_cpp_log_with_boost_log=false', ], ) diff --git a/subprojects/restc-cpp/meson.build b/subprojects/restc-cpp/meson.build index 8a7d309..a04e61e 100644 --- a/subprojects/restc-cpp/meson.build +++ b/subprojects/restc-cpp/meson.build @@ -10,13 +10,16 @@ if get_option('restc_cpp_with_zlib') endif compiler_opts = ['-DBOOST_COROUTINE_NO_DEPRECATION_WARNING=1'] +boost_modules = [ + 'system', 'program_options', 'filesystem', 'date_time', + 'context', 'coroutine', 'chrono' +] +if get_option('restc_cpp_log_with_boost_log') + boost_modules += ['log'] +endif + thread_dep = dependency('threads') -boost_dep = dependency('boost', - modules: [ - 'system', 'program_options', 'filesystem', 'date_time', - 'context', 'coroutine', 'chrono', 'log' - ] -) +boost_dep = dependency('boost', modules: boost_modules) rapidjson_dep = dependency('RapidJSON') if not get_option('embedded_restc_cpp') diff --git a/subprojects/restc-cpp/restc-cpp b/subprojects/restc-cpp/restc-cpp index c2b893a..533eb51 160000 --- a/subprojects/restc-cpp/restc-cpp +++ b/subprojects/restc-cpp/restc-cpp @@ -1 +1 @@ -Subproject commit c2b893a3979c92ab94137203294badc1c26513cd +Subproject commit 533eb5155bd185fd726e5bd1e61ef9a209f49497