build (linux): Migrate fmt dep to vcpkg (from externals)
Now both linux and windows use vcpkg's fmt
This commit is contained in:
1 parent
92e825a73c
commit
6fa1aa036f
12 files changed
+30
-17
No files matched your search
@@ -53,6 +53,7 @@
|
||||
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
|
||||
"CMAKE_PREFIX_PATH": "${sourceDir}/cmake/;${sourceDir}/.venv/lib/python3.10/site-packages/pybind11/share/cmake/pybind11",
|
||||
"CMAKE_EXE_LINKER_FLAGS": "-Wno-undef",
|
||||
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
|
||||
"EXTERNALS_ROOT": "${sourceDir}/externals/linux",
|
||||
"BUILD_SDK": {
|
||||
"type": "BOOL",
|
||||
|
||||
+1
-1
Submodule externals updated: ff5f02bbde...d02b1ead20.
@@ -38,13 +38,15 @@ static bool parse(
|
||||
JsonReader jreader{&js};
|
||||
if (!jreader.read<bool>("success")) {
|
||||
LOG(md, Error,
|
||||
"BinanceMiniTickerUpdate json field 'success' is false:\n{}", js);
|
||||
"BinanceMiniTickerUpdate json field 'success' is false:\n{}",
|
||||
js.dump());
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!jreader.read("result", ticker_upds)) {
|
||||
LOG(md, Error,
|
||||
"BinanceMiniTickerUpdate json field 'result' is invalid:\n{}", js);
|
||||
"BinanceMiniTickerUpdate json field 'result' is invalid:\n{}",
|
||||
js.dump());
|
||||
}
|
||||
return !ticker_upds.empty();
|
||||
}
|
||||
|
||||
@@ -33,7 +33,8 @@ static bool parse(
|
||||
}
|
||||
JsonReader jr{&js};
|
||||
if (!jr.read(result)) {
|
||||
LOG(md, Error, "Failed to read BinancePriceStatistics json:\n{}", js);
|
||||
LOG(md, Error, "Failed to read BinancePriceStatistics json:\n{}",
|
||||
js.dump());
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
||||
@@ -36,7 +36,7 @@ static bool parse(
|
||||
JsonReader jr{&js};
|
||||
if (!jr.read(result)) {
|
||||
LOG(md, Error, "Failed to read BinanceUsPriceChangeStatistics json:\n{}",
|
||||
js);
|
||||
js.dump());
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
||||
@@ -32,7 +32,8 @@ static bool parse(
|
||||
JsonReader jr{&js};
|
||||
if (!jr.read(result)) {
|
||||
LOG(md, Error,
|
||||
"Failed to read BinanceUsdsFuturePriceStatistics json:\n{}", js);
|
||||
"Failed to read BinanceUsdsFuturePriceStatistics json:\n{}",
|
||||
js.dump());
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
||||
@@ -32,14 +32,15 @@ static bool parse(
|
||||
JsonReader jreader{&js};
|
||||
if (!jreader.read<bool>("success")) {
|
||||
LOG(md, Error,
|
||||
"FTXHistoricalPriceRecord json field 'success' is false:\n{}", js);
|
||||
"FTXHistoricalPriceRecord json field 'success' is false:\n{}",
|
||||
js.dump());
|
||||
return false;
|
||||
}
|
||||
if (!jreader.read("result", price_recs)) {
|
||||
LOG(md, Error,
|
||||
"Failed to read FTXHistoricalPriceRecord json from field "
|
||||
"'result':\n{}",
|
||||
js);
|
||||
js.dump());
|
||||
}
|
||||
return !price_recs.empty();
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
function(get_link_libraries dest)
|
||||
find_package(fmt CONFIG REQUIRED)
|
||||
set(${dest}
|
||||
system
|
||||
domain
|
||||
@@ -15,8 +16,7 @@ function(get_link_libraries dest)
|
||||
protoc
|
||||
ssl
|
||||
crypto
|
||||
debug fmtd
|
||||
optimized fmt
|
||||
fmt::fmt
|
||||
cryptopp
|
||||
SQLiteCpp
|
||||
sqlite3
|
||||
|
||||
@@ -18,7 +18,6 @@ function(get_proto_sources cfg_srcs non_cfg_srcs service_srcs cfg_defaults)
|
||||
list(REMOVE_ITEM _non_cfg_srcs ${_service_srcs})
|
||||
|
||||
set(_cfg_defaults)
|
||||
|
||||
foreach(cfg_path ${CONFIG_DEFAULTS_PATH})
|
||||
file(
|
||||
GLOB_RECURSE cfg_files
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
function(get_link_libraries dest)
|
||||
find_package(fmt CONFIG REQUIRED)
|
||||
set(${dest}
|
||||
system
|
||||
domain
|
||||
@@ -17,8 +18,7 @@ function(get_link_libraries dest)
|
||||
uuid
|
||||
ssl
|
||||
crypto
|
||||
debug fmtd
|
||||
optimized fmt
|
||||
fmt::fmt
|
||||
tbb
|
||||
cryptopp
|
||||
pugixml
|
||||
|
||||
@@ -7,8 +7,15 @@ target_link_libraries(
|
||||
${PROJECT_NAME}
|
||||
PUBLIC
|
||||
boost_filesystem
|
||||
debug fmtd
|
||||
optimized fmt
|
||||
boost_filesystem
|
||||
boost_thread
|
||||
protobuf
|
||||
uuid
|
||||
)
|
||||
|
||||
# fmt
|
||||
find_package(fmt CONFIG REQUIRED)
|
||||
target_link_libraries(
|
||||
${PROJECT_NAME}
|
||||
PUBLIC
|
||||
fmt::fmt
|
||||
)
|
||||
+2
-1
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"dependencies": [
|
||||
"fmt"
|
||||
"fmt",
|
||||
"catch2"
|
||||
],
|
||||
"builtin-baseline": "bb002e69deb36c00e9ce21810f69eff349a833f7",
|
||||
"overrides": [
|
||||
|
||||
Reference in new issue
Block a user