fix: fmt
This commit is contained in:
parent
0933aad75f
commit
2d2fb88040
18
meson.build
18
meson.build
|
@ -4,7 +4,8 @@ project(
|
||||||
license: 'MIT',
|
license: 'MIT',
|
||||||
default_options : [
|
default_options : [
|
||||||
'cpp_std=c++17',
|
'cpp_std=c++17',
|
||||||
'buildtype=release'
|
'buildtype=release',
|
||||||
|
'default_library=static'
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -17,16 +18,21 @@ if false # libc++
|
||||||
|
|
||||||
cpp_link_args += ['-lc++fs']
|
cpp_link_args += ['-lc++fs']
|
||||||
else
|
else
|
||||||
# TODO: For std::filesystem in libstdc++. Still unstable? Or why is it not in libstdc++ proper yet?
|
|
||||||
cpp_link_args += ['-lstdc++fs']
|
cpp_link_args += ['-lstdc++fs']
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
compiler = meson.get_compiler('cpp')
|
||||||
|
|
||||||
|
if not compiler.has_header('filesystem')
|
||||||
|
add_project_arguments('-DFILESYSTEM_EXPERIMENTAL', language: 'cpp')
|
||||||
|
endif
|
||||||
|
|
||||||
add_global_arguments(cpp_args, language : 'cpp')
|
add_global_arguments(cpp_args, language : 'cpp')
|
||||||
add_global_link_arguments(cpp_link_args, language : 'cpp')
|
add_global_link_arguments(cpp_link_args, language : 'cpp')
|
||||||
|
|
||||||
thread_dep = dependency('threads')
|
thread_dep = dependency('threads')
|
||||||
libinput = dependency('libinput')
|
libinput = dependency('libinput')
|
||||||
fmt = dependency('fmt', fallback: ['fmtlib', 'fmt_dep'])
|
fmt = dependency('fmt', version : ['>=5.2.1'], fallback : ['fmt', 'fmt_dep'])
|
||||||
wayland_client = dependency('wayland-client')
|
wayland_client = dependency('wayland-client')
|
||||||
wayland_cursor = dependency('wayland-cursor')
|
wayland_cursor = dependency('wayland-cursor')
|
||||||
wayland_protos = dependency('wayland-protocols')
|
wayland_protos = dependency('wayland-protocols')
|
||||||
|
@ -83,12 +89,6 @@ if dbusmenu_gtk.found()
|
||||||
)
|
)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
compiler = meson.get_compiler('cpp')
|
|
||||||
|
|
||||||
if not compiler.has_header('filesystem')
|
|
||||||
add_project_arguments('-DFILESYSTEM_EXPERIMENTAL', language: 'cpp')
|
|
||||||
endif
|
|
||||||
|
|
||||||
subdir('protocol')
|
subdir('protocol')
|
||||||
|
|
||||||
executable(
|
executable(
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
[wrap-file]
|
||||||
|
directory = fmt-5.2.1
|
||||||
|
|
||||||
|
source_url = https://github.com/fmtlib/fmt/archive/5.2.1.tar.gz
|
||||||
|
source_filename = fmt-5.2.1.tar.gz
|
||||||
|
source_hash = 3c812a18e9f72a88631ab4732a97ce9ef5bcbefb3235e9fd465f059ba204359b
|
||||||
|
|
||||||
|
patch_url = https://wrapdb.mesonbuild.com/v1/projects/fmt/5.2.1/1/get_zip
|
||||||
|
patch_filename = fmt-5.2.1-1-wrap.zip
|
||||||
|
patch_hash = 7add08bb4e168c0809e88c6aa64ed5c3494b74deb6be12a93e1e4dc5bb3a1fc1
|
|
@ -1,10 +0,0 @@
|
||||||
[wrap-file]
|
|
||||||
directory = fmt-5.2.0
|
|
||||||
|
|
||||||
source_url = https://github.com/fmtlib/fmt/archive/5.2.0.tar.gz
|
|
||||||
source_filename = fmt-5.2.0.tar.gz
|
|
||||||
source_hash = b0e8c71a8fb906123966686f788e83cd95ae499afe9c25ff6284f624488435ac
|
|
||||||
|
|
||||||
patch_url = https://wrapdb.mesonbuild.com/v1/projects/fmt/5.2.0/1/get_zip
|
|
||||||
patch_filename = fmt-5.2.0-1-wrap.zip
|
|
||||||
patch_hash = 04005310ad939bc640ca0eb918e6b5390dbd5b5cb9d58636eb7c442306aa14cd
|
|
Loading…
Reference in New Issue