diff options
| author | Aqua-sama <aqua@iserlohn-fortress.net> | 2020-10-24 19:33:36 +0300 |
|---|---|---|
| committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2020-10-28 09:52:04 +0200 |
| commit | 54afcf199f487579979fc6902ea8692667c58a63 (patch) | |
| tree | 55fbfbdf6fb6e251e3ca6e11653b7ab41d63e537 | |
| parent | Fix useless-cast warnings in Configuration (diff) | |
| download | smolbote-54afcf199f487579979fc6902ea8692667c58a63.tar.xz | |
Update wraps
| -rw-r--r-- | lib/session_formats/meson.build | 2 | ||||
| -rw-r--r-- | linux/meson.build | 12 | ||||
| -rw-r--r-- | meson.build | 6 | ||||
| -rw-r--r-- | subprojects/spdlog.wrap | 15 |
4 files changed, 13 insertions, 22 deletions
diff --git a/lib/session_formats/meson.build b/lib/session_formats/meson.build index 8d52455..8996db6 100644 --- a/lib/session_formats/meson.build +++ b/lib/session_formats/meson.build @@ -1,6 +1,6 @@ lib_session_formats = declare_dependency( include_directories: [ '.', plugininterfaces_include ], - link_with: library('sessionformats', [ 'session_json.cpp' ], include_directories: plugininterfaces_include, dependencies: dep_qt5) + link_with: static_library('sessionformats', [ 'session_json.cpp' ], include_directories: plugininterfaces_include, dependencies: dep_qt5) ) test('session: json format', executable('session_json', diff --git a/linux/meson.build b/linux/meson.build index 5b5c79e..87154f9 100644 --- a/linux/meson.build +++ b/linux/meson.build @@ -16,15 +16,3 @@ foreach f : desktop_files configure_file(input: f + '.in', output: f, configuration: conf, install_dir: desktop_dir) endforeach -# producing debug symbols -if get_option('crashhandler').enabled() -custom_target('poi-sym', - input: poi_exe, - output: 'poi.sym', - capture: true, - command: [ find_program('dump_syms'), '@INPUT@' ], - build_by_default: false, -# install_dir: symbols/poi/$(head -n1 linux/poi.sym | awk '{ print $(NF-1) }') -) -endif - diff --git a/meson.build b/meson.build index 2ae2941..1dd1a1f 100644 --- a/meson.build +++ b/meson.build @@ -30,7 +30,11 @@ endif sourceset = import('sourceset') cxx = meson.get_compiler('cpp') -summary({'id': cxx.get_id()}, section: 'Compiler') +summary({ + 'id': cxx.get_id(), + 'version': cxx.version(), + 'linker': cxx.get_linker_id(), +}, section: 'Compiler') # add some specific flags add_project_arguments(cxx.get_supported_arguments([ diff --git a/subprojects/spdlog.wrap b/subprojects/spdlog.wrap index b0f760b..51e0ddb 100644 --- a/subprojects/spdlog.wrap +++ b/subprojects/spdlog.wrap @@ -1,10 +1,9 @@ [wrap-file] -directory = spdlog-1.4.2 +directory = spdlog-1.8.0 +source_url = https://github.com/gabime/spdlog/archive/v1.8.0.tar.gz +source_filename = v1.8.0.tar.gz +source_hash = 1e68e9b40cf63bb022a4b18cdc1c9d88eb5d97e4fd64fa981950a9cacf57a4bf +patch_url = https://wrapdb.mesonbuild.com/v1/projects/spdlog/1.8.0/1/get_zip +patch_filename = spdlog-1.8.0-1-wrap.zip +patch_hash = f783da51f6bebc99624504ca16fc1265b92add514956db9aa669a287d85b5049 -source_url = https://github.com/gabime/spdlog/archive/v1.4.2.tar.gz -source_filename = v1.4.2.tar.gz -source_hash = 821c85b120ad15d87ca2bc44185fa9091409777c756029125a02f81354072157 - -patch_url = https://wrapdb.mesonbuild.com/v1/projects/spdlog/1.4.2/1/get_zip -patch_filename = spdlog-1.4.2-1-wrap.zip -patch_hash = e0616f2a956670b0b23daba08f14d4f51a9551e74071269bc218cd05b666b229 |