update ios packing

Author: Cynthia Jiang

CMakeLists.txt

@@ -304,7 +304,7 @@ endif()
 
 if(FIREBASE_UNI_LIBRARY)
   if(FIREBASE_IOS_BUILD)
-    ios_pack(firebase_lib_uni libFirebaseCppApp DEPS ${TARGET_LINK_LIB_NAMES})
+    ios_pack(firebase_lib_uni libFirebaseCppApp DEPS "firebase_app" "firebase_app_swig" "flatbuffers")
   else()
     build_uni(
       "${TARGET_LINK_LIB_NAMES}"

analytics/CMakeLists.txt

@@ -51,7 +51,7 @@ mono_add_library(firebase_analytics_cs
 )
 
 if(FIREBASE_IOS_BUILD)
-  ios_pack(firebase_lib_analytics libFirebaseCppAnalytics DEPS firebase_analytics_swig)
+  ios_pack(firebase_lib_analytics libFirebaseCppAnalytics DEPS firebase_analytics firebase_analytics_swig)
 else()
   build_firebase_shared(
     analytics

auth/CMakeLists.txt

@@ -65,13 +65,13 @@ mono_add_library(firebase_auth_cs
 )
 
 if(FIREBASE_IOS_BUILD)
-  ios_pack(firebase_lib_auth libFirebaseCppAuth DEPS firebase_auth_swig)
+  ios_pack(firebase_lib_auth libFirebaseCppAuth DEPS firebase_auth firebase_auth_swig)
 else()
-build_firebase_shared(
-  auth
-  auth
-  FirebaseCppAuth
-)
+  build_firebase_shared(
+    auth
+    auth
+    FirebaseCppAuth
+  )
 endif()
 
 unity_pack_cs(firebase_auth_cs)

cmake/build_shared.cmake

@@ -29,16 +29,11 @@ function(build_firebase_shared LIBRARY_NAME ARTIFACT_NAME OUTPUT_NAME)
 
   add_library(${shared_target} SHARED
     ${FIREBASE_SOURCE_DIR}/empty.cc
+    $<TARGET_OBJECTS:firebase_${LIBRARY_NAME}>
     $<TARGET_OBJECTS:firebase_${LIBRARY_NAME}_swig>
   )
-
-  # add_dependencies(${shared_target}
-  #   firebase_${LIBRARY_NAME}
-  #   firebase_app
-  # )
 
-  set(SHARED_TARGET_LINK_LIB_NAMES "firebase_${LIBRARY_NAME}_swig")
-  message("SHARED_TARGET_LINK_LIB_NAMES is ${SHARED_TARGET_LINK_LIB_NAMES}")
+  set(SHARED_TARGET_LINK_LIB_NAMES "firebase_${LIBRARY_NAME}" "firebase_${LIBRARY_NAME}_swig")
 
   target_link_libraries(${shared_target}
     ${SHARED_TARGET_LINK_LIB_NAMES}

cmake/ios_pack.cmake

@@ -19,6 +19,13 @@ if (CMAKE_INTERPROCEDURAL_OPTIMIZATION)
   set(ar_tool ${CMAKE_CXX_COMPILER_AR})
 endif()
 
+if(NOT CMAKE_LIBTOOL)
+  find_program(CMAKE_LIBTOOL NAMES libtool)
+endif()
+if(CMAKE_LIBTOOL)
+  set(CMAKE_LIBTOOL ${CMAKE_LIBTOOL} CACHE PATH "libtool executable")  
+endif()
+
 # Packs static libraries into one static library for ios and sets up the correct
 # install call for it
 #
@@ -49,7 +56,7 @@ macro(ios_pack name output_name)
       set(first false)
       string(APPEND content "cp $<TARGET_FILE:${dep}> ${TARGET_FILE}\n")
     else()
-      string(APPEND content "${ar_tool} -q $<TARGET_FILE:${dep}> ${TARGET_FILE}\n")
+      string(APPEND content "${CMAKE_LIBTOOL} -static -o ${TARGET_FILE} ${TARGET_FILE} $<TARGET_FILE:${dep}>\n")
     endif()
   endforeach()
 

crashlytics/CMakeLists.txt

@@ -90,13 +90,13 @@ mono_add_library(firebase_crashlytics_cs
 )
 
 if(FIREBASE_IOS_BUILD)
-  ios_pack(firebase_lib_crashlytics libFirebaseCppCrashlytics DEPS firebase_crashlytics_swig)
+  ios_pack(firebase_lib_crashlytics libFirebaseCppCrashlytics DEPS firebase_crashlytics firebase_crashlytics_swig)
 else()
-build_firebase_shared(
-  crashlytics
-  crashlytics
-  FirebaseCppCrashlytics
-)
+  build_firebase_shared(
+    crashlytics
+    crashlytics
+    FirebaseCppCrashlytics
+  )
 endif()
 
 unity_pack_cs(firebase_crashlytics_cs)

database/CMakeLists.txt

@@ -69,13 +69,13 @@ mono_add_library(firebase_database_cs
 )
 
 if(FIREBASE_IOS_BUILD)
-  ios_pack(firebase_lib_database libFirebaseCppDatabase DEPS firebase_database_swig)
+  ios_pack(firebase_lib_database libFirebaseCppDatabase DEPS firebase_database firebase_database_swig)
 else()
-build_firebase_shared(
-  database
-  database
-  FirebaseCppDatabase
-)
+  build_firebase_shared(
+    database
+    database
+    FirebaseCppDatabase
+  )
 endif()
 
 unity_pack_cs(firebase_database_cs)

dynamic_links/CMakeLists.txt

@@ -63,13 +63,13 @@ mono_add_library(firebase_dynamic_links_cs
 )
 
 if(FIREBASE_IOS_BUILD)
-  ios_pack(firebase_lib_dynamic_links libFirebaseCppDynamicLinks DEPS firebase_dynamic_links_swig)
+  ios_pack(firebase_lib_dynamic_links libFirebaseCppDynamicLinks DEPS firebase_dynamic_links firebase_dynamic_links_swig)
 else()
-build_firebase_shared(
-  dynamic_links
-  dynamic-links
-  FirebaseCppDynamicLinks
-)
+  build_firebase_shared(
+    dynamic_links
+    dynamic-links
+    FirebaseCppDynamicLinks
+  )
 endif()
 
 unity_pack_cs(firebase_dynamic_links_cs)

firestore/CMakeLists.txt

@@ -143,13 +143,13 @@ mono_add_library(firebase_firestore_cs
 )
 
 if(FIREBASE_IOS_BUILD)
-  ios_pack(firebase_lib_firestore libFirebaseCppFirestore DEPS firebase_firestore_swig)
+  ios_pack(firebase_lib_firestore libFirebaseCppFirestore DEPS firebase_firestore firebase_firestore_swig firebase_firestore_swig_cpp)
 else()
-build_firebase_shared(
-  firestore
-  firestore
-  FirebaseCppFirestore
-)
+  build_firebase_shared(
+    firestore
+    firestore
+    FirebaseCppFirestore
+  )
 endif()
 
 unity_pack_cs(firebase_firestore_cs)

functions/CMakeLists.txt

@@ -55,7 +55,7 @@ mono_add_library(firebase_functions_cs
 )
 
 if(FIREBASE_IOS_BUILD)
-  ios_pack(firebase_lib_functions libFirebaseCppFunctions DEPS firebase_functions_swig)
+  ios_pack(firebase_lib_functions libFirebaseCppFunctions DEPS firebase_functions firebase_functions_swig)
 else()
 build_firebase_shared(
   functions