diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2018-08-14 13:28:28 -0700 |
|---|---|---|
| committer | jmkiley <jordan.kiley@mapbox.com> | 2018-08-15 09:00:26 -0700 |
| commit | b3bd2d0312e46a806040993e46535a15ac2adb31 (patch) | |
| tree | 3ff0949985d3b1383ee8274c52825c57aea21388 | |
| parent | 0cd99987f93f5de49b125b3bb5f54357b258f210 (diff) | |
| download | qtlocation-mapboxgl-upstream/jmkiley-cp-12224.tar.gz | |
[build] make sure we're also updating the mapbox-ios-events submoduleupstream/jmkiley-cp-12224
| -rw-r--r-- | cmake/mbgl.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cmake/mbgl.cmake b/cmake/mbgl.cmake index f087c32511..cdca60c89c 100644 --- a/cmake/mbgl.cmake +++ b/cmake/mbgl.cmake @@ -40,9 +40,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") @@ -56,7 +61,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..." ) |