diff options
| author | Andrei Klimovich <andrey.klimovich@mapbox.com> | 2020-01-30 19:47:39 +0300 |
|---|---|---|
| committer | Andrei Klimovich <andrey.klimovich@mapbox.com> | 2020-02-03 12:47:55 +0300 |
| commit | 915fb0fe9fe14c334830624910f9807bc17f5fbb (patch) | |
| tree | 237994070aa240acb910924d71dba2d205aaf4b7 | |
| parent | 52b39f28b490d218e5de9c43ecd02e7b2093e02a (diff) | |
| download | qtlocation-mapboxgl-upstream/debug-qt-cmake37.tar.gz | |
fix cmake 3.7 buildupstream/debug-qt-cmake37
| -rw-r--r-- | platform/qt/qt.cmake | 2 | ||||
| -rw-r--r-- | src/mbgl/storage/file_source_manager.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index 0d2cf81b01..c07eb9f914 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -22,7 +22,7 @@ endif() target_sources( mbgl-core PRIVATE - ${PROJECT_SOURCE_DIR}/platform/$<IF:$<PLATFORM_ID:Windows>,qt/src/bidi.cpp,default/src/mbgl/text/bidi.cpp> + ${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/text/bidi.cpp ${PROJECT_SOURCE_DIR}/platform/default/include/mbgl/gfx/headless_backend.hpp ${PROJECT_SOURCE_DIR}/platform/default/include/mbgl/gfx/headless_frontend.hpp ${PROJECT_SOURCE_DIR}/platform/default/include/mbgl/gl/headless_backend.hpp diff --git a/src/mbgl/storage/file_source_manager.cpp b/src/mbgl/storage/file_source_manager.cpp index 6817717f1a..d3c1df289d 100644 --- a/src/mbgl/storage/file_source_manager.cpp +++ b/src/mbgl/storage/file_source_manager.cpp @@ -44,7 +44,8 @@ std::shared_ptr<FileSource> FileSourceManager::getFileSource(FileSourceType type auto it = impl->fileSourceFactories.find(type); if (it != impl->fileSourceFactories.end()) { assert(it->second); - impl->fileSources[key] = fileSource = it->second(options); + fileSource = it->second(options); + impl->fileSources[key] = fileSource; } } |