summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2018-09-19 09:55:12 +0200
committerKonstantin Käfer <mail@kkaefer.com>2018-09-19 09:56:22 +0200
commita217e8aeb7dac92992e5d980058ce31bc07bc826 (patch)
tree9c03f55d1a3bbab235294f209099587f3ce75e4c
parent80bdbebdfebe0f3291a73ccefc5c5956640533e3 (diff)
downloadqtlocation-mapboxgl-upstream/glfw-db.tar.gz
[core] add --cache option to GLFW binary to specify the cache databaseupstream/glfw-db
-rw-r--r--cmake/glfw.cmake2
-rw-r--r--platform/glfw/main.cpp4
2 files changed, 5 insertions, 1 deletions
diff --git a/cmake/glfw.cmake b/cmake/glfw.cmake
index c59ca013d0..eacc72d338 100644
--- a/cmake/glfw.cmake
+++ b/cmake/glfw.cmake
@@ -39,11 +39,13 @@ xcode_create_scheme(
TARGET mbgl-glfw
OPTIONAL_ARGS
"--style=file.json"
+ "--cache=/tmp/mbgl-cache.db"
"--lon=0"
"--lat=0"
"--zoom=1"
"--bearing=0"
"--pitch=0"
"--fullscreen"
+ "--offline"
"--benchmark"
)
diff --git a/platform/glfw/main.cpp b/platform/glfw/main.cpp
index 8915f1d7f1..1bb2e13614 100644
--- a/platform/glfw/main.cpp
+++ b/platform/glfw/main.cpp
@@ -43,6 +43,7 @@ int main(int argc, char *argv[]) {
args::Flag offlineFlag(argumentParser, "offline", "Toggle offline", {'o', "offline"});
args::ValueFlag<std::string> styleValue(argumentParser, "URL", "Map stylesheet", {'s', "style"});
+ args::ValueFlag<std::string> cacheDBValue(argumentParser, "file", "Cache database file name", {'c', "cache"});
args::ValueFlag<double> lonValue(argumentParser, "degrees", "Longitude", {'x', "lon"});
args::ValueFlag<double> latValue(argumentParser, "degrees", "Latitude", {'y', "lat"});
args::ValueFlag<double> zoomValue(argumentParser, "number", "Zoom level", {'z', "zoom"});
@@ -76,6 +77,7 @@ int main(int argc, char *argv[]) {
const bool fullscreen = fullscreenFlag ? args::get(fullscreenFlag) : false;
const bool benchmark = benchmarkFlag ? args::get(benchmarkFlag) : false;
std::string style = styleValue ? args::get(styleValue) : "";
+ const std::string cacheDB = cacheDBValue ? args::get(cacheDBValue) : "/tmp/mbgl-cache.db";
// sigint handling
struct sigaction sigIntHandler;
@@ -91,7 +93,7 @@ int main(int argc, char *argv[]) {
GLFWView backend(fullscreen, benchmark);
view = &backend;
- mbgl::DefaultFileSource fileSource("/tmp/mbgl-cache.db", ".");
+ mbgl::DefaultFileSource fileSource(cacheDB, ".");
if (!settings.online) {
fileSource.setOnlineStatus(false);
mbgl::Log::Warning(mbgl::Event::Setup, "Application is offline. Press `O` to toggle online status.");