From 54bdabd7d5f8072cfc099ffc4d4572936e6e709b Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Mon, 11 Apr 2022 21:49:44 -0500 Subject: [PATCH 1/6] Update maplibre-gl-native to 2022-04-07 --- external/mapbox-gl-native | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mapbox-gl-native b/external/mapbox-gl-native index 8c0f3839..225f8a4b 160000 --- a/external/mapbox-gl-native +++ b/external/mapbox-gl-native @@ -1 +1 @@ -Subproject commit 8c0f3839d13bdb4f42de3b856b723df9c2af5623 +Subproject commit 225f8a4bfe7ad30fd59d693c1fb3ca0ba70d2806 From a18db83730b51734781772cfbde411d5ff38e822 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Mon, 11 Apr 2022 21:53:35 -0500 Subject: [PATCH 2/6] Upgrading dependencies --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 08a4c264..41a23cdb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,18 +12,18 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) include(${PROJECT_SOURCE_DIR}/external/cmake-conan/conan.cmake) -conan_cmake_configure(REQUIRES boost/1.77.0 +conan_cmake_configure(REQUIRES boost/1.78.0 freetype/2.11.1 geographiclib/1.52 glew/2.2.0 glm/0.9.9.8 gtest/cci.20210126 - openssl/1.1.1m - vulkan-loader/1.2.198.0 + openssl/1.1.1n + vulkan-loader/1.3.204.1 GENERATORS cmake cmake_find_package cmake_paths - BUILD_REQUIRES cmake/3.21.3 + BUILD_REQUIRES cmake/3.22.3 IMPORTS "bin, *.dll -> ./bin" IMPORTS "lib, *.dylib -> ./bin" OPTIONS openssl:shared=True) From ae886fd624af1010b37c61697362318a8baf6758 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Tue, 12 Apr 2022 20:35:37 -0500 Subject: [PATCH 3/6] Workaround for Boost 1.78.0 log namespace change --- scwx-qt/scwx-qt.cmake | 4 ++++ test/test.cmake | 5 +++++ wxdata/wxdata.cmake | 3 +++ 3 files changed, 12 insertions(+) diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake index a8f7911e..f1759304 100644 --- a/scwx-qt/scwx-qt.cmake +++ b/scwx-qt/scwx-qt.cmake @@ -206,6 +206,10 @@ qt6_create_translation_scwx(QM_FILES ${scwx-qt_SOURCE_DIR} ${TS_FILES}) if (WIN32) target_compile_definitions(scwx-qt PUBLIC WIN32_LEAN_AND_MEAN) target_compile_definitions(supercell-wx PUBLIC WIN32_LEAN_AND_MEAN) + + # For Boost::log + target_compile_definitions(scwx-qt PRIVATE BOOST_USE_WINAPI_VERSION=0x0601) + target_compile_definitions(supercell-wx PRIVATE BOOST_USE_WINAPI_VERSION=0x0601) endif() target_include_directories(scwx-qt PUBLIC ${scwx-qt_SOURCE_DIR}/source diff --git a/test/test.cmake b/test/test.cmake index 2820dc09..9525a4e6 100644 --- a/test/test.cmake +++ b/test/test.cmake @@ -54,6 +54,11 @@ endif() target_compile_definitions(wxtest PRIVATE SCWX_TEST_DATA_DIR="${SCWX_DIR}/test/data") +if (WIN32) + # For Boost::log + target_compile_definitions(wxtest PRIVATE BOOST_USE_WINAPI_VERSION=0x0601) +endif() + gtest_discover_tests(wxtest) target_link_libraries(wxtest GTest::gtest diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake index a1dcdd8c..e23ef30e 100644 --- a/wxdata/wxdata.cmake +++ b/wxdata/wxdata.cmake @@ -198,6 +198,9 @@ target_link_libraries(wxdata INTERFACE Boost::iostreams if (WIN32) target_link_libraries(wxdata INTERFACE Ws2_32) + + # For Boost::log + target_compile_definitions(wxdata PRIVATE BOOST_USE_WINAPI_VERSION=0x0601) endif() set_target_properties(wxdata PROPERTIES CXX_STANDARD 20 From 59cb4355917154876ee8df2db96162ebfd9cdfd0 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Tue, 12 Apr 2022 20:36:04 -0500 Subject: [PATCH 4/6] Upgrade setup scripts to Qt 6.3.0 --- setup-debug.bat | 2 +- setup-release.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup-debug.bat b/setup-debug.bat index fb224d41..c98e4b61 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.1.1\msvc2019_64 .. +cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CONFIGURATION_TYPES=Debug -DCMAKE_PREFIX_PATH=C:\Qt\6.3.0\msvc2019_64 .. pause diff --git a/setup-release.bat b/setup-release.bat index 1022ed11..a5a27970 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.1.1\msvc2019_64 .. +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_PREFIX_PATH=C:\Qt\6.3.0\msvc2019_64 .. pause From 5489552ff3d9d76a95e8faac669cf58c87055af0 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Tue, 12 Apr 2022 20:36:28 -0500 Subject: [PATCH 5/6] Add mbgl include directory for Qt --- external/mapbox-gl-native.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/external/mapbox-gl-native.cmake b/external/mapbox-gl-native.cmake index 3a6c156d..d8bc00e0 100644 --- a/external/mapbox-gl-native.cmake +++ b/external/mapbox-gl-native.cmake @@ -9,7 +9,8 @@ find_package(ZLIB) target_include_directories(mbgl-core PRIVATE ${ZLIB_INCLUDE_DIRS}) target_link_libraries(mbgl-core INTERFACE ${ZLIB_LIBRARIES}) -set(MBGL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/mapbox-gl-native/include PARENT_SCOPE) +set(MBGL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/mapbox-gl-native/include + ${CMAKE_CURRENT_SOURCE_DIR}/mapbox-gl-native/platform/qt/include PARENT_SCOPE) set_target_properties(mbgl-qt PROPERTIES EXCLUDE_FROM_ALL True) set_target_properties(mbgl-test-runner PROPERTIES EXCLUDE_FROM_ALL True) From e075e88c7fb93241bd236271537fdbd88c526d52 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Tue, 12 Apr 2022 21:37:26 -0500 Subject: [PATCH 6/6] Move mbgl cache to application local data storage --- scwx-qt/source/scwx/qt/main/main_window.cpp | 19 ++++++++++++++++++- scwx-qt/ts/scwx_en_US.ts | 2 +- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/scwx-qt/source/scwx/qt/main/main_window.cpp b/scwx-qt/source/scwx/qt/main/main_window.cpp index fd72560c..fd237a56 100644 --- a/scwx-qt/source/scwx/qt/main/main_window.cpp +++ b/scwx-qt/source/scwx/qt/main/main_window.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -41,7 +42,23 @@ public: elevationButtonsChanged_ {false}, resizeElevationButtons_ {false} { - settings_.setCacheDatabasePath("/tmp/mbgl-cache.db"); + std::string appDataPath { + QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + .toStdString()}; + std::string cacheDbPath {appDataPath + "/mbgl-cache.db"}; + + if (!std::filesystem::exists(appDataPath)) + { + if (!std::filesystem::create_directories(appDataPath)) + { + BOOST_LOG_TRIVIAL(error) + << logPrefix_ + << "Unable to create application local data directory: \"" + << appDataPath << "\""; + } + } + + settings_.setCacheDatabasePath(QString {cacheDbPath.c_str()}); settings_.setCacheDatabaseMaximumSize(20 * 1024 * 1024); } ~MainWindowImpl() = default; diff --git a/scwx-qt/ts/scwx_en_US.ts b/scwx-qt/ts/scwx_en_US.ts index 030a9249..35c2eac2 100644 --- a/scwx-qt/ts/scwx_en_US.ts +++ b/scwx-qt/ts/scwx_en_US.ts @@ -102,7 +102,7 @@ scwx::qt::main::MainWindow - + Unrecognized NEXRAD Product: