diff --git a/CMakePresets.json b/CMakePresets.json index fea1d9c51..d6686f175 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -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", diff --git a/externals b/externals index ff5f02bbd..d02b1ead2 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit ff5f02bbde0f584493835ac267af34b31e637845 +Subproject commit d02b1ead20f3c87293f3d372840b30b6c9196115 diff --git a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp index 30d1a6b98..951426e36 100644 --- a/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinanceMiniTickerUpdate.cpp @@ -38,13 +38,15 @@ static bool parse( JsonReader jreader{&js}; if (!jreader.read("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(); } diff --git a/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp b/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp index 621292f38..aca25dcd4 100644 --- a/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/binance/BinancePriceStatistics.cpp @@ -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; diff --git a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp index a6efc28d1..ee15e1e3f 100644 --- a/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/binance_us/BinanceUsPriceStatistics.cpp @@ -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; diff --git a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp index b8a1dd840..d47c02340 100644 --- a/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp +++ b/src/app_sparkd/sparkd/md/binance_usds_futures/BinanceUsdsFuturesPriceStatistics.cpp @@ -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; diff --git a/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp index 969f7938b..b7812499d 100644 --- a/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp +++ b/src/app_sparkd/sparkd/md/ftx/FTXHistoricalPriceRecord.cpp @@ -32,14 +32,15 @@ static bool parse( JsonReader jreader{&js}; if (!jreader.read("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(); } diff --git a/src/lib_spark/cmake/GetLinuxClientLinkLibraries.cmake b/src/lib_spark/cmake/GetLinuxClientLinkLibraries.cmake index 081a61d5f..4a73d1661 100644 --- a/src/lib_spark/cmake/GetLinuxClientLinkLibraries.cmake +++ b/src/lib_spark/cmake/GetLinuxClientLinkLibraries.cmake @@ -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 diff --git a/src/lib_spark/cmake/GetLinuxClientSources.cmake b/src/lib_spark/cmake/GetLinuxClientSources.cmake index 0831dbb23..e987f0011 100644 --- a/src/lib_spark/cmake/GetLinuxClientSources.cmake +++ b/src/lib_spark/cmake/GetLinuxClientSources.cmake @@ -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 diff --git a/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake b/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake index ee20c7f82..74b64336c 100644 --- a/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake +++ b/src/lib_spark/cmake/GetLinuxServerLinkLibraries.cmake @@ -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 diff --git a/src/lib_system/CMakeLists.txt b/src/lib_system/CMakeLists.txt index a40894b07..ae93f280b 100644 --- a/src/lib_system/CMakeLists.txt +++ b/src/lib_system/CMakeLists.txt @@ -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 ) diff --git a/vcpkg.json b/vcpkg.json index a60d60c97..376bc7d18 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,7 @@ { "dependencies": [ - "fmt" + "fmt", + "catch2" ], "builtin-baseline": "bb002e69deb36c00e9ce21810f69eff349a833f7", "overrides": [