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

Add maplibre-native submodule for greater flexibility of versioning

Browse source
This commit is contained in:
Dan Paulat 2024-03-02 00:57:43 -06:00
parent 737b023c32
commit 5efeeb1080
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -34,3 +34,6 @@
[submodule "external/maplibre-native-qt"] [submodule "external/maplibre-native-qt"]
path = external/maplibre-native-qt path = external/maplibre-native-qt
url = https://github.com/maplibre/maplibre-native-qt.git url = https://github.com/maplibre/maplibre-native-qt.git
[submodule "external/maplibre-native"]
path = external/maplibre-native
url = https://github.com/maplibre/maplibre-native.git

1
external/maplibre-native vendored Submodule

@ -0,0 +1 @@
Subproject commit 4fff8a5d33852c7bc4c5d8c989092eb42769a71d

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

@ -5,6 +5,7 @@ set(gtest_disable_pthreads ON)
set(MLN_WITH_QT ON) set(MLN_WITH_QT ON)
set(MLN_QT_WITH_INTERNAL_ICU ON) set(MLN_QT_WITH_INTERNAL_ICU ON)
set(MLN_QT_WITH_LOCATION OFF) set(MLN_QT_WITH_LOCATION OFF)
set(MLN_CORE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/maplibre-native)
add_subdirectory(maplibre-native-qt) add_subdirectory(maplibre-native-qt)
find_package(ZLIB) find_package(ZLIB)
@ -23,7 +24,7 @@ else()
target_compile_options(Core PRIVATE "$<$<CONFIG:Release>:-g>") target_compile_options(Core PRIVATE "$<$<CONFIG:Release>:-g>")
endif() endif()
set(MLN_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/maplibre-native-qt/vendor/maplibre-native/include set(MLN_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/maplibre-native/include
${CMAKE_CURRENT_SOURCE_DIR}/maplibre-native-qt/src/core/include ${CMAKE_CURRENT_SOURCE_DIR}/maplibre-native-qt/src/core/include
${CMAKE_CURRENT_BINARY_DIR}/maplibre-native-qt/src/core/include PARENT_SCOPE) ${CMAKE_CURRENT_BINARY_DIR}/maplibre-native-qt/src/core/include PARENT_SCOPE)