mirror of
https://gitlab.freedesktop.org/pipewire/wireplumber.git
synced 2025-12-20 05:20:05 +01:00
Allow system cpptoml
meson.build: When the 'wrap_mode' option is set to 'nodownload' use a system version of cpptoml. This does not require using git and having a network connection during build, which is important for Linux packaging infrastructure. subprojects/cpptoml.wrap: Pin revision to last release tag (v0.1.1). lib/wptoml/*.cpp: Remove 'include/' prefix from all cpptoml related includes, at is not required. Closes #17
This commit is contained in:
parent
4eb853ca7a
commit
fbe1e5177b
5 changed files with 11 additions and 7 deletions
|
|
@ -10,7 +10,7 @@
|
|||
#include <functional>
|
||||
|
||||
/* CPPTOML */
|
||||
#include <include/cpptoml.h>
|
||||
#include <cpptoml.h>
|
||||
|
||||
/* TOML */
|
||||
#include "private.h"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
*/
|
||||
|
||||
/* CPPTOML */
|
||||
#include <include/cpptoml.h>
|
||||
#include <cpptoml.h>
|
||||
|
||||
/* TOML */
|
||||
#include "private.h"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
#include <functional>
|
||||
|
||||
/* CPPTOML */
|
||||
#include <include/cpptoml.h>
|
||||
#include <cpptoml.h>
|
||||
|
||||
/* TOML */
|
||||
#include "private.h"
|
||||
|
|
|
|||
10
meson.build
10
meson.build
|
|
@ -26,9 +26,13 @@ else
|
|||
wireplumber_config_dir = join_paths(get_option('prefix'), get_option('sysconfdir'), 'wireplumber')
|
||||
endif
|
||||
|
||||
cmake = import('cmake')
|
||||
cpptoml = cmake.subproject('cpptoml')
|
||||
cpptoml_dep = cpptoml.dependency('cpptoml')
|
||||
if get_option('wrap_mode') == 'nodownload'
|
||||
cpptoml_dep = dependency('cpptoml')
|
||||
else
|
||||
cmake = import('cmake')
|
||||
cpptoml = cmake.subproject('cpptoml')
|
||||
cpptoml_dep = cpptoml.dependency('cpptoml')
|
||||
endif
|
||||
|
||||
gobject_dep = dependency('gobject-2.0', version : '>= 2.58')
|
||||
gmodule_dep = dependency('gmodule-2.0', version : '== ' + gobject_dep.version())
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[wrap-git]
|
||||
directory=cpptoml
|
||||
url=https://github.com/skystrife/cpptoml.git
|
||||
revision=master
|
||||
revision=v0.1.1
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue