diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2017-02-08 13:26:23 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2017-02-08 19:07:16 +0100 |
| commit | bb931505c5f11c21a31cdd7be6fe036ca44e729d (patch) | |
| tree | e0310f3a4965dbe364639efb610d96eeca49ee19 /cmake/mbgl.cmake | |
| parent | f5b86c0f11bc921647d1f677b62a14527bfb50c3 (diff) | |
| download | qtlocation-mapboxgl-bb931505c5f11c21a31cdd7be6fe036ca44e729d.tar.gz | |
[build] Remove Mason submodule in favor of CMake mason
Diffstat (limited to 'cmake/mbgl.cmake')
| -rw-r--r-- | cmake/mbgl.cmake | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/cmake/mbgl.cmake b/cmake/mbgl.cmake index ca0487ef34..813e4ba071 100644 --- a/cmake/mbgl.cmake +++ b/cmake/mbgl.cmake @@ -6,10 +6,6 @@ if (NOT MBGL_PLATFORM) endif() endif() -if (NOT MASON_PLATFORM) - set(MASON_PLATFORM "${MBGL_PLATFORM}") -endif() - if(NOT EXISTS ${CMAKE_SOURCE_DIR}/node_modules/node-cmake/FindNodeJS.cmake) message(FATAL_ERROR "Can't find node-cmake") endif() @@ -54,7 +50,7 @@ endfunction() # Run submodule update message(STATUS "Updating submodules...") execute_process( - COMMAND git submodule update --init .mason mapbox-gl-js + COMMAND git submodule update --init mapbox-gl-js WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") if(NOT EXISTS "${CMAKE_SOURCE_DIR}/mapbox-gl-js/node_modules") @@ -68,7 +64,7 @@ endif() # Add target for running submodule update during builds add_custom_target( update-submodules ALL - COMMAND git submodule update --init .mason mapbox-gl-js + COMMAND git submodule update --init mapbox-gl-js WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" COMMENT "Updating submodules..." ) |