From bb931505c5f11c21a31cdd7be6fe036ca44e729d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Wed, 8 Feb 2017 13:26:23 +0100 Subject: [build] Remove Mason submodule in favor of CMake mason --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 48c62007ee..6ca19d3e41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ project(mbgl LANGUAGES CXX C) set(CMAKE_CXX_STANDARD 14) include(cmake/mbgl.cmake) -include(.mason/mason.cmake) +include(cmake/mason.cmake) option(WITH_CXX11ABI "Use cxx11abi mason packages" OFF) option(WITH_COVERAGE "Enable coverage reports" OFF) @@ -41,12 +41,12 @@ set_source_files_properties(src/mbgl/util/version.cpp PROPERTIES COMPILE_DEFINIT mason_use(geometry VERSION 0.9.0 HEADER_ONLY) mason_use(variant VERSION 1.1.4 HEADER_ONLY) -mason_use(unique_resource VERSION dev HEADER_ONLY) +mason_use(unique_resource VERSION cba309e HEADER_ONLY) mason_use(rapidjson VERSION 1.1.0 HEADER_ONLY) mason_use(boost VERSION 1.62.0 HEADER_ONLY) mason_use(geojsonvt VERSION 6.1.3 HEADER_ONLY) -mason_use(supercluster VERSION 0.2.0 HEADER_ONLY) -mason_use(kdbush VERSION 0.1.1 HEADER_ONLY) +mason_use(supercluster VERSION 0.2.0-1 HEADER_ONLY) +mason_use(kdbush VERSION 0.1.1-1 HEADER_ONLY) mason_use(earcut VERSION 0.12.1 HEADER_ONLY) mason_use(protozero VERSION 1.4.2 HEADER_ONLY) mason_use(pixelmatch VERSION 0.10.0 HEADER_ONLY) -- cgit v1.2.1