summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-12-21 10:38:56 -0800
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-12-22 15:41:10 -0800
commit317b2bf42fc16b629abcd0a984d4acc14070904f (patch)
treef77903d6514c1fd1ea3cf24cb33644e3719ee92e
parent531c983b73f01c3894a8984077620ed633351b20 (diff)
downloadqtlocation-mapboxgl-317b2bf42fc16b629abcd0a984d4acc14070904f.tar.gz
[build] Use a submodule for mapbox-gl-js rather than an npm dependency
-rw-r--r--.gitmodules3
-rw-r--r--CMakeLists.txt6
-rw-r--r--cmake/shaders.cmake2
m---------mapbox-gl-js0
-rw-r--r--package.json1
5 files changed, 10 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index af156810c6..9a9f6c1ed1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -12,3 +12,6 @@
[submodule "platform/ios/uitest/OHHTTPStubs"]
path = platform/ios/uitest/OHHTTPStubs
url = https://github.com/AliSoftware/OHHTTPStubs.git
+[submodule "mapbox-gl-js"]
+ path = mapbox-gl-js
+ url = git://github.com/mapbox/mapbox-gl-js.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28778ed58a..a9f52ba9de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,12 @@ if(NOT EXISTS ".mason/mason.cmake")
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
endif()
+if(NOT EXISTS "mapbox-gl-js/package.json")
+ execute_process(
+ COMMAND git submodule update --init mapbox-gl-js
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+endif()
+
include(.mason/mason.cmake)
option(WITH_CXX11ABI "Use cxx11abi mason packages" OFF)
diff --git a/cmake/shaders.cmake b/cmake/shaders.cmake
index 833ebec862..fc6575537a 100644
--- a/cmake/shaders.cmake
+++ b/cmake/shaders.cmake
@@ -1,6 +1,6 @@
function(add_shader VAR name)
set(shader_build_cmd ${NodeJS_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripts/build-shaders.js)
- set(shader_file_prefix ${CMAKE_SOURCE_DIR}/node_modules/mapbox-gl/shaders)
+ set(shader_file_prefix ${CMAKE_SOURCE_DIR}/mapbox-gl-js/shaders)
set(shader_source_prefix ${MBGL_GENERATED}/include/mbgl/shader)
add_custom_command(
diff --git a/mapbox-gl-js b/mapbox-gl-js
new file mode 160000
+Subproject ef5582dd3bc5c15a3112e875ed66494dab8e9d0
diff --git a/package.json b/package.json
index ff549ff844..cdf7a338f8 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
"ejs": "^2.4.1",
"express": "^4.11.1",
"lodash": "^4.16.4",
- "mapbox-gl": "mapbox/mapbox-gl-js#ef5582dd3bc5c15a3112e875ed66494dab8e9d0b",
"mapbox-gl-style-spec": "mapbox/mapbox-gl-style-spec#49e8b407bdbbe6f7c92dbcb56d3d51f425fc2653",
"mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#da53a81453068f4c2b440f9077d6bd5e7e14ff3d",
"mkdirp": "^0.5.1",