Meson wrap file for beast, remove git submodule

This commit is contained in:
King_DuckZ 2022-05-13 23:31:04 +02:00
parent 8f2a819ebe
commit 10fc605078
7 changed files with 30 additions and 15 deletions

3
.gitignore vendored
View file

@ -1,4 +1,5 @@
tags tags
subprojects/simdjson subprojects/simdjson/
subprojects/curlcpp/ subprojects/curlcpp/
compile_commands.json compile_commands.json
subprojects/beast/

3
.gitmodules vendored
View file

@ -1,6 +1,3 @@
[submodule "subprojects/wrenpp"] [submodule "subprojects/wrenpp"]
path = subprojects/wrenpp path = subprojects/wrenpp
url = https://alarmpi.no-ip.org/gitan/King_DuckZ/wrenpp.git url = https://alarmpi.no-ip.org/gitan/King_DuckZ/wrenpp.git
[submodule "subprojects/beast"]
path = subprojects/beast
url = https://github.com/boostorg/beast.git

View file

@ -8,8 +8,6 @@ project('duckticker', 'cpp',
full_config_dir = get_option('prefix') / get_option('sysconfdir') full_config_dir = get_option('prefix') / get_option('sysconfdir')
compiler_opts = ['-DWRENPP_WITH_NAME_GUESSING'] compiler_opts = ['-DWRENPP_WITH_NAME_GUESSING']
beast_include = include_directories('subprojects/beast/include')
subdir('src') subdir('src')
#if meson.source_root() != full_config_dir #if meson.source_root() != full_config_dir

View file

@ -10,14 +10,14 @@ wrenpp_dep = dependency('wrenpp', version: '>=0.1.1',
default_options: ['wren_with_rand=true'], default_options: ['wren_with_rand=true'],
) )
boost_dep = dependency('boost', version: '>=1.78.0',
modules: ['coroutine', 'filesystem', 'system', 'thread'],
)
simdjson_dep = dependency('simdjson', version: '>=0.5.0', simdjson_dep = dependency('simdjson', version: '>=0.5.0',
fallback: ['simdjson', 'simdjson_dep'], fallback: ['simdjson', 'simdjson_dep'],
) )
beast_dep = dependency('beast', version: '>=1.79.0',
fallback: ['beast', 'beast_dep'],
)
executable(meson.project_name(), executable(meson.project_name(),
'main.cpp', 'main.cpp',
'nap/http_header_parse.cpp', 'nap/http_header_parse.cpp',
@ -28,10 +28,7 @@ executable(meson.project_name(),
curlcpp_dep, curlcpp_dep,
wrenpp_dep, wrenpp_dep,
simdjson_dep, simdjson_dep,
boost_dep, beast_dep,
], ],
cpp_args: compiler_opts, cpp_args: compiler_opts,
include_directories: [
beast_include,
],
) )

@ -1 +0,0 @@
Subproject commit 9d23bec2bc523223a377582302bd28d04cb514ed

7
subprojects/beast.wrap Normal file
View file

@ -0,0 +1,7 @@
[wrap-git]
url = https://github.com/boostorg/beast.git
revision = a332f55d63b89b7b178a70b56d82315d7957fe90
patch_directory = beast
[provide]
dependency_names = beast-1.79.0

View file

@ -0,0 +1,16 @@
project('beast', 'cpp',
version: '1.79.0',
meson_version: '>=0.49.2',
default_options: ['buildtype=release', 'cpp_std=c++11', 'b_ndebug=if-release'],
license: 'BSL-1.0',
)
boost_dep = dependency('boost', version: '>=1.78.0',
modules: ['coroutine', 'filesystem', 'system', 'thread'],
)
public_incl = include_directories('include')
beast_dep = declare_dependency(
include_directories: public_incl,
dependencies: [boost_dep],
)