From acdf8fe1587932125ae9feebb654717ece0dfaf2 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sat, 4 May 2024 01:38:17 -0500 Subject: [PATCH] Update to latest maplibre-native (cd6a0ab1, April 30) --- external/maplibre-native | 2 +- external/maplibre-native-qt | 2 +- external/maplibre-native-qt.cmake | 16 ++++++++-------- scwx-qt/scwx-qt.cmake | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/external/maplibre-native b/external/maplibre-native index 6932d9b4..23792807 160000 --- a/external/maplibre-native +++ b/external/maplibre-native @@ -1 +1 @@ -Subproject commit 6932d9b49cf01ac75b79aff9f9a9f0f9ce97a9ae +Subproject commit 237928075a8391e1c1469f79d74458d566075012 diff --git a/external/maplibre-native-qt b/external/maplibre-native-qt index fe734916..3c372608 160000 --- a/external/maplibre-native-qt +++ b/external/maplibre-native-qt @@ -1 +1 @@ -Subproject commit fe734916414ce761e053dafaeecafeb19d51509c +Subproject commit 3c37260837e3084a1fc04f377433328f74b41a87 diff --git a/external/maplibre-native-qt.cmake b/external/maplibre-native-qt.cmake index 9d44009b..6a508040 100644 --- 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 "$<$:/Zi>") - target_compile_options(Core PRIVATE "$<$:/Zi>") - target_link_options(Core PRIVATE "$<$:/DEBUG>") - target_link_options(Core PRIVATE "$<$:/OPT:REF>") - target_link_options(Core PRIVATE "$<$:/OPT:ICF>") + target_compile_options(MLNQtCore PRIVATE "$<$:/Zi>") + target_link_options(MLNQtCore PRIVATE "$<$:/DEBUG>") + target_link_options(MLNQtCore PRIVATE "$<$:/OPT:REF>") + target_link_options(MLNQtCore PRIVATE "$<$:/OPT:ICF>") else() target_compile_options(mbgl-core PRIVATE "$<$:-g>") - target_compile_options(Core PRIVATE "$<$:-g>") + target_compile_options(MLNQtCore PRIVATE "$<$:-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 index 1c5458e3..7e5f8f72 100644 --- 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)