[build] remove roundtrip through <experimental/optional> when using optional

8 files changed, 14 insertions, 4 deletions

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 <experimental/optional>
+#include <optional.hpp>
 
 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 <cstring>
 #include <cstdio>
 #include <chrono>
-#include <experimental/optional>
+#include <optional.hpp>
 
 #include <mbgl/util/traits.hpp>
 #include <mbgl/util/logging.hpp>
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 <string>
 #include <cmath>
-#include <experimental/optional>
+#include <optional.hpp>
 
 namespace CSSColorParser {
 
diff --git a/vendor/optional b/vendor/optional
-Subproject 5f08e2e2012398b9511ba15506611d7e36e8930
+Subproject f6249e7fdcb80131c390a083f1621d96023e72e
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
 )