aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Morgner <felix.morgner@gmail.com>2024-05-17 16:11:47 +0200
committerFelix Morgner <felix.morgner@gmail.com>2024-05-17 16:11:47 +0200
commitc893434519811d4fbd04f3a5a23971f0ef93cf24 (patch)
treeb07af60abd56635966efc834f7e1e277465523be
parent40ed7b9b5e1892d204b1ce56bbaf394bc7ecf12d (diff)
downloadwanda-c893434519811d4fbd04f3a5a23971f0ef93cf24.tar.xz
wanda-c893434519811d4fbd04f3a5a23971f0ef93cf24.zip
build: update dependencies
-rw-r--r--.vscode/tasks.json5
-rw-r--r--conan.lock4
-rw-r--r--conanfile.py4
3 files changed, 7 insertions, 6 deletions
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index ff5fb7f..01876f1 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -16,11 +16,12 @@
"label": "conan: bootstrap",
"dependsOrder": "sequence",
"dependsOn": [
- "conan: install",
+ "conan: install"
],
"runOptions": {
"runOn": "folderOpen"
- }
+ },
+ "problemMatcher": []
}
]
} \ No newline at end of file
diff --git a/conan.lock b/conan.lock
index b04b987..c415bec 100644
--- a/conan.lock
+++ b/conan.lock
@@ -2,13 +2,13 @@
"version": "0.5",
"requires": [
"zlib/1.3.1#f52e03ae3d251dec704634230cd806a2%1708593606.497",
- "spdlog/1.12.0#baf01ff8c9be09bb6cb6c62c1804012c%1709323024.67",
+ "spdlog/1.14.1#972bbf70be1da4bc57ea589af0efde03%1714610543.14",
"lyra/1.6.1#06fa7f247d1f93f4f5d5017cbd578376%1701546832.709",
"libpng/1.6.43#c219d8f01983bac10c404fc613605eef%1708791038.007",
"libjpeg-turbo/3.0.3#5a1be473b22bcf5536e0b091764b0cc8%1715190175.365",
"fmt/10.2.1#9199a7a0611866dea5c8849a77467b25%1704415120.216",
"catch2/3.5.4#d346ca291f8f62040fd9c1a891654711%1712851544.79",
- "boost/1.83.0#21fcda49ae156b727862fea3db61e68c%1715614148.563"
+ "boost/1.85.0#7926babdab0a9779cc164d0af6c28d5e%1715614149.259"
],
"build_requires": [
"ninja/1.12.1#e5397d3ce52a127f189df5f32c2f4306%1715439974.169",
diff --git a/conanfile.py b/conanfile.py
index 11d3a29..ef5d671 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -40,7 +40,7 @@ class Wanda(ConanFile):
)
def requirements(self):
- self.requires("boost/[~1.83]", transitive_headers=not self.options.nolibs, options={
+ self.requires("boost/[~1.85]", transitive_headers=not self.options.nolibs, options={
"asio_no_deprecated": True,
"system_no_deprecated": True,
"header_only": True,
@@ -48,7 +48,7 @@ class Wanda(ConanFile):
self.requires("libjpeg-turbo/[~3.0]")
self.requires("libpng/[~1.6]")
self.requires("lyra/[~1.6]")
- self.requires("spdlog/[~1.12]", transitive_headers=not self.options.nolibs, options={
+ self.requires("spdlog/[~1.14]", transitive_headers=not self.options.nolibs, options={
"header_only": True,
})