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

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

Browse source
This commit is contained in:
Dan Paulat 2022-04-12 21:37:48 -05:00
commit 7aef98b002
10 changed files with 40 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -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)

2
external/mapbox-gl-native vendored

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

3
external/mapbox-gl-native.cmake vendored
View file

@ -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)

4
scwx-qt/scwx-qt.cmake
View file

@ -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

19
scwx-qt/source/scwx/qt/main/main_window.cpp
View file

@ -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;

2
scwx-qt/ts/scwx_en_US.ts
View file

@ -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>

2
setup-debug.bat
View file

@ -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

2
setup-release.bat
View file

@ -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

5
test/test.cmake
View file

@ -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

3
wxdata/wxdata.cmake
View file

@ -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