Skip to content

Commit

Permalink
Revert "build: Update to fmt 10 (#1427)"
Browse files Browse the repository at this point in the history
This reverts commit 75b14e1.

This commit breaks MSVS builds. Abseil package fails to build.
  • Loading branch information
Vasil Pashov committed Mar 15, 2024
1 parent 75b14e1 commit 9680cbf
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
1 change: 0 additions & 1 deletion cpp/arcticdb/util/allocator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include <folly/concurrency/ConcurrentHashMap.h>
#include <folly/ThreadCachedInt.h>

#include <fmt/std.h>

namespace arcticdb {

Expand Down
2 changes: 1 addition & 1 deletion cpp/vcpkg
Submodule vcpkg updated 3341 files
4 changes: 2 additions & 2 deletions cpp/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
{ "name": "boost-winapi", "version": "1.80.0#1" },
{ "name": "curl", "version": "8.4.0" },
{ "name": "double-conversion", "version": "3.2.1" },
{ "name": "fmt", "version": "10.2.1" },
{ "name": "fmt", "version": "9.1.0#1" },
{ "name": "folly", "version-string": "2022.10.31.00#3" },
{ "name": "gflags", "version": "2.2.2#5" },
{ "name": "glog", "version": "0.6.0#2" },
Expand All @@ -165,7 +165,7 @@
{ "name": "protobuf", "version": "3.21.8" },
{ "name": "rapidcheck", "version": "2021-12-20" },
{ "name": "s2n", "version": "1.3.5" },
{ "name": "spdlog", "version": "1.13.0" },
{ "name": "spdlog", "version": "1.11.0" },
{ "name": "xxhash", "version": "0.8.2" },
{ "name": "zlib", "version": "1.2.13" },
{ "name": "zstd", "version": "1.5.2" }
Expand Down
3 changes: 2 additions & 1 deletion environment_unix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ dependencies:
- azure-storage-blobs-cpp
# RocksDB is not supported on the conda build at the moment
# - rocksdb
- fmt
# ArcticDB is currently incompatible with fmt 10
- fmt < 10
- folly==2023.09.25.00
- unordered_dense
# Vendored build dependencies (see `cpp/thirdparty` and `cpp/vcpkg.json`)
Expand Down

0 comments on commit 9680cbf

Please sign in to comment.