From bb931505c5f11c21a31cdd7be6fe036ca44e729d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Wed, 8 Feb 2017 13:26:23 +0100
Subject: [build] Remove Mason submodule in favor of CMake mason

---
 cmake/mbgl.cmake | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'cmake/mbgl.cmake')

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..."
 )
-- 
cgit v1.2.1