summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2018-08-14 13:28:28 -0700
committerKonstantin Käfer <mail@kkaefer.com>2018-08-14 17:03:46 -0700
commit9d72bf8a1a708ce66ebc1a3c8823013964b62c1b (patch)
treecdf67469bd90a624a6627263e9c26b921395d2ac
parent084c28f0bb3969aaa09078c278f08f83e389eda2 (diff)
downloadqtlocation-mapboxgl-9d72bf8a1a708ce66ebc1a3c8823013964b62c1b.tar.gz
[build] make sure we're also updating the mapbox-ios-events submodule
-rw-r--r--cmake/mbgl.cmake9
1 files changed, 7 insertions, 2 deletions
diff --git a/cmake/mbgl.cmake b/cmake/mbgl.cmake
index 3abc974feb..233ae6e8b8 100644
--- a/cmake/mbgl.cmake
+++ b/cmake/mbgl.cmake
@@ -64,9 +64,14 @@ if(WITH_NODEJS)
endfunction()
# Run submodule update
+ set(MBGL_SUBMODULES mapbox-gl-js)
+ if (MBGL_PLATFORM STREQUAL "ios")
+ list(APPEND MBGL_SUBMODULES platform/ios/vendor/mapbox-events-ios)
+ endif()
+
message(STATUS "Updating submodules...")
execute_process(
- COMMAND git submodule update --init mapbox-gl-js
+ COMMAND git submodule update --init ${MBGL_SUBMODULES}
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
if(NOT EXISTS "${CMAKE_SOURCE_DIR}/mapbox-gl-js/node_modules")
@@ -80,7 +85,7 @@ if(WITH_NODEJS)
# Add target for running submodule update during builds
add_custom_target(
update-submodules ALL
- COMMAND git submodule update --init mapbox-gl-js
+ COMMAND git submodule update --init ${MBGL_SUBMODULES}
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
COMMENT "Updating submodules..."
)