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

Update to latest maplibre-native (cd6a0ab1, April 30)

Browse source
This commit is contained in:
Dan Paulat 2024-05-04 01:38:17 -05:00
parent ef40b2ecb9
commit acdf8fe158
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
external/maplibre-native vendored

@ -1 +1 @@
Subproject commit 6932d9b49cf01ac75b79aff9f9a9f0f9ce97a9ae Subproject commit 237928075a8391e1c1469f79d74458d566075012

2
external/maplibre-native-qt vendored

@ -1 +1 @@
Subproject commit fe734916414ce761e053dafaeecafeb19d51509c Subproject commit 3c37260837e3084a1fc04f377433328f74b41a87

16
external/maplibre-native-qt.cmake vendored
View file

@ -15,13 +15,13 @@ target_link_libraries(mbgl-core INTERFACE ${ZLIB_LIBRARIES})
if (MSVC) if (MSVC)
# Produce PDB file for debug # Produce PDB file for debug
target_compile_options(mbgl-core PRIVATE "$<$<CONFIG:Release>:/Zi>") target_compile_options(mbgl-core PRIVATE "$<$<CONFIG:Release>:/Zi>")
target_compile_options(Core PRIVATE "$<$<CONFIG:Release>:/Zi>") target_compile_options(MLNQtCore PRIVATE "$<$<CONFIG:Release>:/Zi>")
target_link_options(Core PRIVATE "$<$<CONFIG:Release>:/DEBUG>") target_link_options(MLNQtCore PRIVATE "$<$<CONFIG:Release>:/DEBUG>")
target_link_options(Core PRIVATE "$<$<CONFIG:Release>:/OPT:REF>") target_link_options(MLNQtCore PRIVATE "$<$<CONFIG:Release>:/OPT:REF>")
target_link_options(Core PRIVATE "$<$<CONFIG:Release>:/OPT:ICF>") target_link_options(MLNQtCore PRIVATE "$<$<CONFIG:Release>:/OPT:ICF>")
else() else()
target_compile_options(mbgl-core PRIVATE "$<$<CONFIG:Release>:-g>") target_compile_options(mbgl-core PRIVATE "$<$<CONFIG:Release>:-g>")
target_compile_options(Core PRIVATE "$<$<CONFIG:Release>:-g>") target_compile_options(MLNQtCore PRIVATE "$<$<CONFIG:Release>:-g>")
endif() endif()
set(MLN_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/maplibre-native/include set(MLN_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/maplibre-native/include
@ -30,13 +30,13 @@ set(MLN_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/maplibre-native/include
set_target_properties(test_mln_core PROPERTIES EXCLUDE_FROM_ALL True) set_target_properties(test_mln_core PROPERTIES EXCLUDE_FROM_ALL True)
set_target_properties(test_mln_widgets PROPERTIES EXCLUDE_FROM_ALL True) set_target_properties(test_mln_widgets PROPERTIES EXCLUDE_FROM_ALL True)
set_target_properties(Widgets PROPERTIES EXCLUDE_FROM_ALL True) set_target_properties(MLNQtWidgets PROPERTIES EXCLUDE_FROM_ALL True)
set_target_properties(test_mln_core PROPERTIES FOLDER mln/exclude) set_target_properties(test_mln_core PROPERTIES FOLDER mln/exclude)
set_target_properties(test_mln_widgets PROPERTIES FOLDER mln/exclude) set_target_properties(test_mln_widgets PROPERTIES FOLDER mln/exclude)
set_target_properties(Widgets PROPERTIES FOLDER mln/exclude) set_target_properties(MLNQtWidgets PROPERTIES FOLDER mln/exclude)
set_target_properties(Core PROPERTIES FOLDER mln) set_target_properties(MLNQtCore PROPERTIES FOLDER mln)
set_target_properties(mbgl-core PROPERTIES FOLDER mln) set_target_properties(mbgl-core PROPERTIES FOLDER mln)
set_target_properties(mbgl-vendor-csscolorparser PROPERTIES FOLDER mln) set_target_properties(mbgl-vendor-csscolorparser PROPERTIES FOLDER mln)
set_target_properties(mbgl-vendor-nunicode PROPERTIES FOLDER mln) set_target_properties(mbgl-vendor-nunicode PROPERTIES FOLDER mln)

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

@ -609,11 +609,11 @@ target_link_libraries(supercell-wx PRIVATE scwx-qt
wxdata) wxdata)
# Set DT_RUNPATH for Linux targets # Set DT_RUNPATH for Linux targets
set_target_properties(Core PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib") # QMapLibre::Core set_target_properties(MLNQtCore PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib") # QMapLibre::Core
set_target_properties(supercell-wx PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib") set_target_properties(supercell-wx PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib")
install(TARGETS supercell-wx install(TARGETS supercell-wx
Core # QMapLibre::Core MLNQtCore # QMapLibre::Core
RUNTIME_DEPENDENCIES RUNTIME_DEPENDENCIES
PRE_EXCLUDE_REGEXES "api-ms-" "ext-ms-" "qt6" PRE_EXCLUDE_REGEXES "api-ms-" "ext-ms-" "qt6"
POST_EXCLUDE_REGEXES ".*system32/.*\\.dll" POST_EXCLUDE_REGEXES ".*system32/.*\\.dll"
@ -626,7 +626,7 @@ install(TARGETS supercell-wx
# NO_TRANSLATIONS is needed for Qt 6.5.0 (will be fixed in 6.5.1) # NO_TRANSLATIONS is needed for Qt 6.5.0 (will be fixed in 6.5.1)
# https://bugreports.qt.io/browse/QTBUG-112204 # https://bugreports.qt.io/browse/QTBUG-112204
qt_generate_deploy_app_script(TARGET Core # QMapLibre::Core qt_generate_deploy_app_script(TARGET MLNQtCore # QMapLibre::Core
OUTPUT_SCRIPT deploy_script_qmaplibre_core OUTPUT_SCRIPT deploy_script_qmaplibre_core
NO_TRANSLATIONS NO_TRANSLATIONS
NO_UNSUPPORTED_PLATFORM_ERROR) NO_UNSUPPORTED_PLATFORM_ERROR)