From e8bfdff3806593b9f056d38edc48b8908e263b56 Mon Sep 17 00:00:00 2001 From: Matt Blair Date: Fri, 7 Dec 2018 13:09:56 -0500 Subject: [PATCH] Enable building iOS static lib with MBTiles option off --- platforms/ios/config.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/platforms/ios/config.cmake b/platforms/ios/config.cmake index 8bb9d40f40..bcb3a7620f 100644 --- a/platforms/ios/config.cmake +++ b/platforms/ios/config.cmake @@ -15,10 +15,10 @@ set(NEXTZEN_API_KEY $ENV{NEXTZEN_API_KEY}) configure_file(${PROJECT_SOURCE_DIR}/platforms/ios/demo/Info.plist.in ${PROJECT_BINARY_DIR}/Info.plist) # Tell SQLiteCpp to not build its own copy of SQLite, we will use the system library instead. +set(SQLITECPP_INTERNAL_SQLITE OFF CACHE BOOL "") if (IOS_SDK_VERSION VERSION_LESS 11.0) set(SQLITE_USE_LEGACY_STRUCT ON CACHE BOOL "") endif() -set(SQLITECPP_INTERNAL_SQLITE OFF CACHE BOOL "") # Headers must be absolute paths for the copy_if_different command on the # static library target, relative paths cause it to fail with an error. @@ -149,14 +149,16 @@ set(TANGRAM_STATIC_DEPENDENCIES "\ $ $ $ - $ $ $ " ) -if (NOT TANGRAM_USE_JSCORE) +if(NOT TANGRAM_USE_JSCORE) set(TANGRAM_STATIC_DEPENDENCIES "${TANGRAM_STATIC_DEPENDENCIES} $") endif() +if(TANGRAM_MBTILES_DATASOURCE) + set(TANGRAM_STATIC_DEPENDENCIES "${TANGRAM_STATIC_DEPENDENCIES} $") +endif() set_target_properties(tangram-static PROPERTIES XCODE_ATTRIBUTE_CURRENT_PROJECT_VERSION "${TANGRAM_FRAMEWORK_VERSION}"