diff --git a/CMakeLists.txt b/CMakeLists.txt index bffe974f..19eba5dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,24 +13,23 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) include(${PROJECT_SOURCE_DIR}/external/cmake-conan/conan.cmake) conan_cmake_configure(REQUIRES aws-sdk-cpp/1.9.234 - boost/1.78.0 - cpr/1.9.0 + boost/1.81.0 + cpr/1.9.3 freetype/2.12.1 geographiclib/1.52 glew/2.2.0 glm/cci.20220420 gtest/cci.20210126 libcurl/7.85.0 - libxml2/2.9.14 - openssl/1.1.1q - spdlog/1.10.0 - sqlite3/3.39.4 - vulkan-loader/1.3.221 + libxml2/2.10.3 + openssl/1.1.1s + spdlog/1.11.0 + sqlite3/3.40.1 + vulkan-loader/1.3.236.0 zlib/1.2.13 GENERATORS cmake cmake_find_package cmake_paths - BUILD_REQUIRES cmake/3.22.3 IMPORTS "bin, *.dll -> ./bin" IMPORTS "lib, *.dylib -> ./bin" OPTIONS openssl:shared=True) diff --git a/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp b/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp index 3851c15c..e7f1192f 100644 --- a/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp +++ b/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp @@ -13,12 +13,14 @@ #include #include +#pragma warning(push, 0) #include #include #include #include #include #include +#pragma warning(pop) namespace scwx { diff --git a/scwx-qt/source/scwx/qt/settings/map_settings.cpp b/scwx-qt/source/scwx/qt/settings/map_settings.cpp index aba0cb46..3476caca 100644 --- a/scwx-qt/source/scwx/qt/settings/map_settings.cpp +++ b/scwx-qt/source/scwx/qt/settings/map_settings.cpp @@ -8,6 +8,8 @@ #include #include +#include + namespace scwx { namespace qt diff --git a/setup-debug.bat b/setup-debug.bat index c98e4b61..512adf0e 100644 --- a/setup-debug.bat +++ b/setup-debug.bat @@ -1,5 +1,5 @@ call tools\setup-common.bat mkdir 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 diff --git a/setup-release.bat b/setup-release.bat index a5a27970..2e2610aa 100644 --- a/setup-release.bat +++ b/setup-release.bat @@ -1,5 +1,5 @@ call tools\setup-common.bat mkdir 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 diff --git a/wxdata/include/scwx/common/color_table.hpp b/wxdata/include/scwx/common/color_table.hpp index 4a630900..0a74c827 100644 --- a/wxdata/include/scwx/common/color_table.hpp +++ b/wxdata/include/scwx/common/color_table.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include namespace scwx { diff --git a/wxdata/source/scwx/network/dir_list.cpp b/wxdata/source/scwx/network/dir_list.cpp index 9f3e9c38..74e00ad4 100644 --- a/wxdata/source/scwx/network/dir_list.cpp +++ b/wxdata/source/scwx/network/dir_list.cpp @@ -98,7 +98,8 @@ void DirListSAXHandler::StartElement(void* userData, const xmlChar* name, const xmlChar** attrs) { - logger_->trace("SAX: Start Element: {}", name); + logger_->trace("SAX: Start Element: {}", + reinterpret_cast(name)); DirListSAXData* data = reinterpret_cast(userData); @@ -140,13 +141,14 @@ void DirListSAXHandler::StartElement(void* userData, } for (int i = 0; attrs != nullptr && attrs[i] != nullptr; ++i) { - logger_->trace(" Attribute: {}", attrs[i]); + logger_->trace(" Attribute: {}", + reinterpret_cast(attrs[i])); } } void DirListSAXHandler::EndElement(void* userData, const xmlChar* name) { - logger_->trace("SAX: End Element: {}", name); + logger_->trace("SAX: End Element: {}", reinterpret_cast(name)); DirListSAXData* data = reinterpret_cast(userData);