Skip to content

Commit

Permalink
build: fix meson warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
ammen99 committed Jul 30, 2023
1 parent 2e3f6f0 commit b72a5ce
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
6 changes: 3 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ project(
'cpp',
version: '0.8.0',
license: 'MIT',
meson_version: '>=0.53.0',
meson_version: '>=0.56.0',
default_options: [
'cpp_std=c++17',
'c_std=c11',
Expand Down Expand Up @@ -61,8 +61,8 @@ conf_data = configuration_data()
version = '"@0@"'.format(meson.project_version())
git = find_program('git', native: true, required: false)
if git.found()
git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'])
git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'])
git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'], check: true)
git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'], check: true)
if git_commit.returncode() == 0 and git_branch.returncode() == 0
version = '"@0@-@1@ (" __DATE__ ", branch \'@2@\')"'.format(
meson.project_version(),
Expand Down
3 changes: 2 additions & 1 deletion plugins/blur/meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
blur_base = shared_module('wayfire-blur-base',
blur_base = shared_library('wayfire-blur-base',
['blur-base.cpp', 'box.cpp', 'gaussian.cpp', 'kawase.cpp', 'bokeh.cpp'],
include_directories: [wayfire_api_inc, wayfire_conf_inc],
dependencies: [wlroots, pixman, wfconfig],
override_options: ['b_lundef=false'],
install: true)
install_headers(['blur.hpp'], subdir: 'wayfire/plugins/blur')

Expand Down
2 changes: 1 addition & 1 deletion proto/meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')
wl_protocol_dir = wayland_protos.get_variable(pkgconfig: 'pkgdatadir')

wayland_scanner = find_program('wayland-scanner', native: true)

Expand Down
2 changes: 1 addition & 1 deletion src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ else
endif


cxx_flags_asan = run_command('/bin/sh', '-c', 'echo $CXXFLAGS $CPPFLAGS | grep fsanitize')
cxx_flags_asan = run_command('/bin/sh', '-c', 'echo $CXXFLAGS $CPPFLAGS | grep fsanitize', check: false)
if get_option('b_sanitize').contains('address') or cxx_flags_asan.returncode() == 0
print_trace = false
message('Address sanitizer enabled, disabling internal backtrace')
Expand Down

0 comments on commit b72a5ce

Please sign in to comment.