Merge branch 'feature/qt-maplibre-upgrade' into develop

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
+                               openssl/1.1.1n
-                               vulkan-loader/1.2.198.0
+                               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)

external/mapbox-gl-native

@@ -1 +1 @@
-Subproject commit 8c0f3839d13bdb4f42de3b856b723df9c2af5623
+Subproject commit 225f8a4bfe7ad30fd59d693c1fb3ca0ba70d2806

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)

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

scwx-qt/source/scwx/qt/main/main_window.cpp

@@ -14,6 +14,7 @@
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QSplitter>
+#include <QStandardPaths>
 #include <QToolButton>
 
 #include <boost/log/trivial.hpp>
@@ -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;

scwx-qt/ts/scwx_en_US.ts

@@ -102,7 +102,7 @@
 <context>
     <name>scwx::qt::main::MainWindow</name>
     <message>
-        <location filename="../source/scwx/qt/main/main_window.cpp" line="262"/>
+        <location filename="../source/scwx/qt/main/main_window.cpp" line="279"/>
         <source>Unrecognized NEXRAD Product:</source>
         <translation type="unfinished"></translation>
     </message>

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

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

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

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