From 844299f1c3b22eed4bf07c37052b3c2ea35e2564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Tue, 11 Jun 2019 10:11:47 +0200 Subject: [build] remove roundtrip through when using optional --- include/mbgl/util/optional.hpp | 2 +- misc/buck/mapbox-gl-native/BUCK | 1 + platform/default/src/mbgl/storage/sqlite3.cpp | 2 +- scripts/generate-file-lists.js | 1 + src/csscolorparser/csscolorparser.hpp | 2 +- vendor/optional | 2 +- vendor/optional-files.json | 8 ++++++++ vendor/optional.cmake | 2 +- 8 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 vendor/optional-files.json diff --git a/include/mbgl/util/optional.hpp b/include/mbgl/util/optional.hpp index abec02dca9..e0a3786a77 100644 --- a/include/mbgl/util/optional.hpp +++ b/include/mbgl/util/optional.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace mbgl { diff --git a/misc/buck/mapbox-gl-native/BUCK b/misc/buck/mapbox-gl-native/BUCK index 34fb97e247..df6a9d563a 100644 --- a/misc/buck/mapbox-gl-native/BUCK +++ b/misc/buck/mapbox-gl-native/BUCK @@ -49,6 +49,7 @@ mbgl_vendor_library("geometry.hpp") mbgl_vendor_library("jni.hpp") mbgl_vendor_library("kdbush.hpp") mbgl_vendor_library("sqlite") +mbgl_vendor_library("optional") mbgl_vendor_library("pixelmatch-cpp") mbgl_vendor_library("polylabel") mbgl_vendor_library("protozero") diff --git a/platform/default/src/mbgl/storage/sqlite3.cpp b/platform/default/src/mbgl/storage/sqlite3.cpp index df60fd05e0..7596ca34a4 100644 --- a/platform/default/src/mbgl/storage/sqlite3.cpp +++ b/platform/default/src/mbgl/storage/sqlite3.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include diff --git a/scripts/generate-file-lists.js b/scripts/generate-file-lists.js index 760a01d87c..f90acbe6e0 100755 --- a/scripts/generate-file-lists.js +++ b/scripts/generate-file-lists.js @@ -136,6 +136,7 @@ generateFileList('vendor/geometry.hpp-files.json', 'vendor/geometry.hpp', vendor generateFileList('vendor/icu-files.json', 'vendor/icu', vendorRegex, [ "include/**/*.h", "src/*.h", "src/*.cpp" ]); generateFileList('vendor/jni.hpp-files.json', 'vendor/jni.hpp', vendorRegex, [ "include/**/*.hpp", ":!:include/jni/string_conversion.hpp" ]); generateFileList('vendor/kdbush.hpp-files.json', 'vendor/kdbush.hpp', vendorRegex, [ "include/*.hpp" ]); +generateFileList('vendor/optional-files.json', 'vendor/optional', vendorRegex, [ "optional.hpp" ]); generateFileList('vendor/pixelmatch-cpp-files.json', 'vendor/pixelmatch-cpp', vendorRegex, [ "include/**/*.hpp" ]); generateFileList('vendor/polylabel-files.json', 'vendor/polylabel', vendorRegex, [ "include/**/*.hpp" ]); generateFileList('vendor/protozero-files.json', 'vendor/protozero', vendorRegex, [ "include/**/*.hpp" ]); diff --git a/src/csscolorparser/csscolorparser.hpp b/src/csscolorparser/csscolorparser.hpp index 0e16ec4996..b6bc5570f9 100644 --- a/src/csscolorparser/csscolorparser.hpp +++ b/src/csscolorparser/csscolorparser.hpp @@ -27,7 +27,7 @@ #include #include -#include +#include namespace CSSColorParser { diff --git a/vendor/optional b/vendor/optional index 5f08e2e201..f6249e7fdc 160000 --- a/vendor/optional +++ b/vendor/optional @@ -1 +1 @@ -Subproject commit 5f08e2e2012398b9511ba15506611d7e36e89301 +Subproject commit f6249e7fdcb80131c390a083f1621d96023e72e9 diff --git a/vendor/optional-files.json b/vendor/optional-files.json new file mode 100644 index 0000000000..4d62a8903c --- /dev/null +++ b/vendor/optional-files.json @@ -0,0 +1,8 @@ +{ + "//": "This file is generated. Do not edit. Regenerate it with scripts/generate-file-lists.js", + "sources": [], + "public_headers": { + "optional.hpp": "vendor/optional/optional.hpp" + }, + "private_headers": {} +} diff --git a/vendor/optional.cmake b/vendor/optional.cmake index ed7bfe8a38..f4b379d3df 100644 --- a/vendor/optional.cmake +++ b/vendor/optional.cmake @@ -1,5 +1,5 @@ add_library(optional INTERFACE) target_include_directories(optional SYSTEM INTERFACE - ${CMAKE_SOURCE_DIR}/vendor/optional/include + ${CMAKE_SOURCE_DIR}/vendor/optional ) -- cgit v1.2.1