From 915fb0fe9fe14c334830624910f9807bc17f5fbb Mon Sep 17 00:00:00 2001
From: Andrei Klimovich <andrey.klimovich@mapbox.com>
Date: Thu, 30 Jan 2020 19:47:39 +0300
Subject: fix cmake 3.7 build

---
 platform/qt/qt.cmake                     | 2 +-
 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;
         }
     }
 
-- 
cgit v1.2.1