aboutsummaryrefslogtreecommitdiff
path: root/src/zencore
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2023-11-13 16:13:42 +0100
committerGitHub <[email protected]>2023-11-13 16:13:42 +0100
commit47c6dc2da58cc8e889c5e59daa3c785fb9455918 (patch)
tree94de6cbb7194f765113443bd329475ed5cf8deda /src/zencore
parentfmt compilation fix for fmt v10+new vs build (#529) (diff)
downloadzen-47c6dc2da58cc8e889c5e59daa3c785fb9455918.tar.xz
zen-47c6dc2da58cc8e889c5e59daa3c785fb9455918.zip
package dependency clean-ups (#531)
this change just cleans up dependency declarations in xmake.lua files, discovered while exploring a more to xrepo which catches dependency problems since it will not just place all includes in a single directory, unlike vcpkg. * removed spurious asio dependency from zenserver-test * removed rocksdb reference * add missing asio package dependency * removed catch2 reference (no longer available) * added explicit cpr reference * made some zencore package dependencies public (this is necessary because some public zencore headers pull in package headers. If you use a more strict package manager than vcpkg then you get compilation errors whenever these includes are pulled in unless you declare the dependency explicitly)
Diffstat (limited to 'src/zencore')
-rw-r--r--src/zencore/xmake.lua16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/zencore/xmake.lua b/src/zencore/xmake.lua
index 73e3b9198..5420464fa 100644
--- a/src/zencore/xmake.lua
+++ b/src/zencore/xmake.lua
@@ -31,15 +31,19 @@ target('zencore')
add_deps("zenbase")
add_packages(
"vcpkg::blake3",
- "vcpkg::doctest",
- "vcpkg::fmt",
- "vcpkg::gsl-lite",
"vcpkg::json11",
- "vcpkg::lz4",
"vcpkg::mimalloc",
"vcpkg::openssl", -- required for crypto
- "vcpkg::spdlog",
- "vcpkg::xxhash")
+ "vcpkg::spdlog")
+
+ add_packages(
+ "vcpkg::doctest",
+ "vcpkg::fmt",
+ "vcpkg::gsl-lite",
+ "vcpkg::lz4",
+ "vcpkg::xxhash",
+ {public=true}
+ )
if is_plat("linux") then
add_syslinks("rt")