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

dpaulat · May 4, 2024 · acdf8fe · acdf8fe
1 parent ef40b2e
commit acdf8fe
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/external/maplibre-native b/external/maplibre-native
diff --git a/external/maplibre-native-qt b/external/maplibre-native-qt
diff --git a/external/maplibre-native-qt.cmake b/external/maplibre-native-qt.cmake
@@ -15,13 +15,13 @@ target_link_libraries(mbgl-core INTERFACE ${ZLIB_LIBRARIES})
 if (MSVC)
     # Produce PDB file for debug
     target_compile_options(mbgl-core PRIVATE "$<$<CONFIG:Release>:/Zi>")
-    target_compile_options(Core PRIVATE "$<$<CONFIG:Release>:/Zi>")
-    target_link_options(Core PRIVATE "$<$<CONFIG:Release>:/DEBUG>")
-    target_link_options(Core PRIVATE "$<$<CONFIG:Release>:/OPT:REF>")
-    target_link_options(Core PRIVATE "$<$<CONFIG:Release>:/OPT:ICF>")
+    target_compile_options(MLNQtCore PRIVATE "$<$<CONFIG:Release>:/Zi>")
+    target_link_options(MLNQtCore PRIVATE "$<$<CONFIG:Release>:/DEBUG>")
+    target_link_options(MLNQtCore PRIVATE "$<$<CONFIG:Release>:/OPT:REF>")
+    target_link_options(MLNQtCore PRIVATE "$<$<CONFIG:Release>:/OPT:ICF>")
 else()
     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()
 
 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_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_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-vendor-csscolorparser PROPERTIES FOLDER mln)
 set_target_properties(mbgl-vendor-nunicode PROPERTIES FOLDER mln)

diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake
@@ -609,11 +609,11 @@ target_link_libraries(supercell-wx PRIVATE scwx-qt
                                            wxdata)
 
 # 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")
 
 install(TARGETS supercell-wx
-                Core # QMapLibre::Core
+                MLNQtCore # QMapLibre::Core
         RUNTIME_DEPENDENCIES
           PRE_EXCLUDE_REGEXES "api-ms-" "ext-ms-" "qt6"
           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)
 # 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
                               NO_TRANSLATIONS
                               NO_UNSUPPORTED_PLATFORM_ERROR)
+1 −1		.github/actions/qt5-build/Dockerfile
+4 −10		.github/actions/qt5-build/entrypoint.sh
+16 −30		.github/actions/qt6-build/entrypoint.sh
+63 −53		.github/workflows/Android.yml
+46 −62		.github/workflows/Linux.yml
+42 −94		.github/workflows/Windows.yml
+1 −1		.github/workflows/gh-pages-docs.yml
+18 −40		.github/workflows/iOS.yml
+42 −108		.github/workflows/macOS.yml
+2 −2		.pre-commit-config.yaml
+32 −6		CMakeLists.txt
+17 −0		CMakePresets.json
+66 −0		cmake/presets/Android.json
+277 −0		cmake/presets/Linux.json
+84 −0		cmake/presets/WASM.json
+247 −0		cmake/presets/Windows.json
+35 −0		cmake/presets/common.json
+109 −0		cmake/presets/iOS.json
+246 −0		cmake/presets/macOS.json
+11 −0		examples/quick/CMakeLists.txt
+59 −0		examples/quick/CMakePresets.json
+10 −0		examples/widgets/CMakeLists.txt
+59 −0		examples/widgets/CMakePresets.json
+26 −25		src/core/CMakeLists.txt
+18 −17		src/location/CMakeLists.txt
+4 −4		src/location/plugins/CMakeLists.txt
+27 −26		src/widgets/CMakeLists.txt
+2 −2		test/core/CMakeLists.txt
+1 −1		test/qml/CMakeLists.txt
+2 −2		test/widgets/CMakeLists.txt