gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[platform-build] Disabled swift/multipart upload for cmake build.

Browse source
This commit is contained in:
Ilya Grechuhin 2018-02-02 17:15:23 +03:00 • committed by Sergey Yershov
parent d3f52af798
commit affc079de8
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
platform/CMakeLists.txt
View file

@ -105,6 +105,7 @@ else() # neither iPhone nor Android
http_thread_apple.h
http_thread_apple.mm
http_uploader_apple.mm
http_uploader_apple.swift
marketing_service_dummy.cpp
platform_mac.mm
platform_unix_impl.cpp
@ -133,8 +134,13 @@ add_subdirectory(platform_tests_support)
add_library(${PROJECT_NAME} ${SRC})
# 2 next lines are added for future support of swift code compilation.
set(SWIFT_BRIDGING_HEADER platform-Swift.h)
set_property(TARGET ${PROJECT_NAME} PROPERTY XCODE_ATTRIBUTE_SWIFT_OBJC_BRIDGING_HEADER "${SWIFT_BRIDGING_HEADER}")
if (APPLE)
target_compile_options(${PROJECT_NAME} PUBLIC "-fobjc-arc")
# "-DIGNORE_SWIFT=1" key is added as the temporary solution until support of swift code compilation.
target_compile_options(${PROJECT_NAME} PUBLIC "-fobjc-arc" "-DIGNORE_SWIFT=1")
endif()
omim_add_test_subdirectory(platform_tests)

5
platform/http_uploader_apple.mm
View file

@ -1,5 +1,7 @@
#import <Foundation/Foundation.h>
#ifndef IGNORE_SWIFT // Temporary solution for CMAKE builds. TODO: Remove when support of swift code compilation is added.
#import "platform-Swift.h"
#endif
#include "platform/http_uploader.hpp"
@ -17,6 +19,7 @@ namespace platform
{
HttpUploader::Result HttpUploader::Upload() const
{
#ifndef IGNORE_SWIFT // Temporary solution for CMAKE builds. TODO: Remove when support of swift code compilation is added.
std::shared_ptr<Result> resultPtr = std::make_shared<Result>();
std::shared_ptr<base::Waiter> waiterPtr = std::make_shared<base::Waiter>();
@ -43,7 +46,7 @@ HttpUploader::Result HttpUploader::Upload() const
if (waiterPtr->Wait(kTimeout) == base::Waiter::Result::NoTimeout)
return *resultPtr;
#endif
return {};
}
} // namespace platform