blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 00:20:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updating most dependencies to latest, holding back libcurl for compatibility with cpr

Browse source
This commit is contained in:
Dan Paulat 2023-01-16 22:19:22 -06:00
parent 5c793e07d8
commit 911226c166
7 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
CMakeLists.txt
View file

@ -13,24 +13,23 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
include(${PROJECT_SOURCE_DIR}/external/cmake-conan/conan.cmake) include(${PROJECT_SOURCE_DIR}/external/cmake-conan/conan.cmake)
conan_cmake_configure(REQUIRES aws-sdk-cpp/1.9.234 conan_cmake_configure(REQUIRES aws-sdk-cpp/1.9.234
boost/1.78.0 boost/1.81.0
cpr/1.9.0 cpr/1.9.3
freetype/2.12.1 freetype/2.12.1
geographiclib/1.52 geographiclib/1.52
glew/2.2.0 glew/2.2.0
glm/cci.20220420 glm/cci.20220420
gtest/cci.20210126 gtest/cci.20210126
libcurl/7.85.0 libcurl/7.85.0
libxml2/2.9.14 libxml2/2.10.3
openssl/1.1.1q openssl/1.1.1s
spdlog/1.10.0 spdlog/1.11.0
sqlite3/3.39.4 sqlite3/3.40.1
vulkan-loader/1.3.221 vulkan-loader/1.3.236.0
zlib/1.2.13 zlib/1.2.13
GENERATORS cmake GENERATORS cmake
cmake_find_package cmake_find_package
cmake_paths cmake_paths
BUILD_REQUIRES cmake/3.22.3
IMPORTS "bin, *.dll -> ./bin" IMPORTS "bin, *.dll -> ./bin"
IMPORTS "lib, *.dylib -> ./bin" IMPORTS "lib, *.dylib -> ./bin"
OPTIONS openssl:shared=True) OPTIONS openssl:shared=True)

2
scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp
View file

@ -13,12 +13,14 @@
#include <mutex> #include <mutex>
#include <shared_mutex> #include <shared_mutex>
#pragma warning(push, 0)
#include <boost/asio/steady_timer.hpp> #include <boost/asio/steady_timer.hpp>
#include <boost/range/irange.hpp> #include <boost/range/irange.hpp>
#include <boost/timer/timer.hpp> #include <boost/timer/timer.hpp>
#include <fmt/chrono.h> #include <fmt/chrono.h>
#include <GeographicLib/Geodesic.hpp> #include <GeographicLib/Geodesic.hpp>
#include <QMapLibreGL/QMapLibreGL> #include <QMapLibreGL/QMapLibreGL>
#pragma warning(pop)
namespace scwx namespace scwx
{ {

2
scwx-qt/source/scwx/qt/settings/map_settings.cpp
View file

@ -8,6 +8,8 @@
#include <array> #include <array>
#include <execution> #include <execution>
#include <boost/json.hpp>
namespace scwx namespace scwx
{ {
namespace qt namespace qt

2
setup-debug.bat
View file

@ -1,5 +1,5 @@
call tools\setup-common.bat call tools\setup-common.bat
mkdir build-debug mkdir build-debug
cd build-debug cd build-debug
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=C:\Qt\6.3.0\msvc2019_64 .. cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=C:\Qt\6.4.2\msvc2019_64 ..
pause pause

2
setup-release.bat
View file

@ -1,5 +1,5 @@
call tools\setup-common.bat call tools\setup-common.bat
mkdir build-release mkdir build-release
cd build-release cd build-release
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=C:\Qt\6.3.0\msvc2019_64 .. cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=C:\Qt\6.4.2\msvc2019_64 ..
pause pause

2
wxdata/include/scwx/common/color_table.hpp
View file

@ -5,7 +5,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <boost/gil.hpp> #include <boost/gil/typedefs.hpp>
namespace scwx namespace scwx
{ {

8
wxdata/source/scwx/network/dir_list.cpp
View file

@ -98,7 +98,8 @@ void DirListSAXHandler::StartElement(void* userData,
const xmlChar* name, const xmlChar* name,
const xmlChar** attrs) const xmlChar** attrs)
{ {
logger_->trace("SAX: Start Element: {}", name); logger_->trace("SAX: Start Element: {}",
reinterpret_cast<const char*>(name));
DirListSAXData* data = reinterpret_cast<DirListSAXData*>(userData); DirListSAXData* data = reinterpret_cast<DirListSAXData*>(userData);
@ -140,13 +141,14 @@ void DirListSAXHandler::StartElement(void* userData,
} }
for (int i = 0; attrs != nullptr && attrs[i] != nullptr; ++i) for (int i = 0; attrs != nullptr && attrs[i] != nullptr; ++i)
{ {
logger_->trace(" Attribute: {}", attrs[i]); logger_->trace(" Attribute: {}",
reinterpret_cast<const char*>(attrs[i]));
} }
} }
void DirListSAXHandler::EndElement(void* userData, const xmlChar* name) void DirListSAXHandler::EndElement(void* userData, const xmlChar* name)
{ {
logger_->trace("SAX: End Element: {}", name); logger_->trace("SAX: End Element: {}", reinterpret_cast<const char*>(name));
DirListSAXData* data = reinterpret_cast<DirListSAXData*>(userData); DirListSAXData* data = reinterpret_cast<DirListSAXData*>(userData);