Firebase Cpp/Unity Kokoro Fixes:

* Fixed ios build not finding existing cpp sdk
* Fixed ios compiler settings not always being set correctly
* Fixed trying to symlink pods before pods where installed

PiperOrigin-RevId: 281322348

Author: markchandler

CMakeLists.txt

@@ -68,23 +68,6 @@ if(DEFINED ANDROID_NDK)
   set(ANDROID 1)
 endif()
 
-if(DEFINED CMAKE_TOOLCHAIN_FILE AND NOT ANDROID)
-  # Force using the toolchain file, as otherwise it loads it later in the
-  # process, after several of the checks against it have failed.
-  if(IS_ABSOLUTE ${CMAKE_TOOLCHAIN_FILE})
-    message("Using Toolchain File: ${CMAKE_TOOLCHAIN_FILE}")
-    include("${CMAKE_TOOLCHAIN_FILE}")
-  else()
-    message("Using Toolchain File: ${CMAKE_BINARY_DIR}/${CMAKE_TOOLCHAIN_FILE}")
-    include("${CMAKE_BINARY_DIR}/${CMAKE_TOOLCHAIN_FILE}")
-  endif()
-endif()
-
-# We're on iOS if the system root is set to "iphone" or some variant.
-if("${CMAKE_OSX_SYSROOT}" MATCHES "iphone")
-  set(IOS TRUE CACHE BOOL "Target platform is iOS.")
-endif()
-
 # Set directories needed by the Firebase subprojects
 # Directory to store generated files.
 set(FIREBASE_GEN_FILE_DIR ${CMAKE_BINARY_DIR}/generated)
@@ -113,8 +96,15 @@ set(FIREBASE_DOWNLOAD_DIR ${PROJECT_BINARY_DIR}/downloads)
 # Run the CMake build logic that will download all the external dependencies.
 download_external_sources()
 
-# Disable the Flatbuffer build tests
+# Disable the Flatbuffer build tests, install and flathash
 set(FLATBUFFERS_BUILD_TESTS OFF CACHE BOOL "")
+set(FLATBUFFERS_INSTALL OFF CACHE BOOL "")
+set(FLATBUFFERS_FLATHASH OFF CACHE BOOL "")
+
+# Disable buliding flatc if cross compiling
+if(IOS OR ANDROID)
+  set(FLATBUFFERS_BUILD_FLATC OFF CACHE BOOL "")
+endif()
 
 # Add flatbuffers as a subdirectory, and set the directory variables for it,
 # so that the sub Firebase projects can depend upon it if necessary.
@@ -230,7 +220,6 @@ if(ANDROID OR IOS)
   endif()
 
   set(FLATBUFFERS_FLATC_EXECUTABLE ${firebase_external_flatc} CACHE STRING "")
-  set(FLATBUFFERS_BUILD_FLATC OFF CACHE BOOL "")
 
   # Setup the flatc custom build target.
   # These commands are executed from within the currect context, which has set

cmake/ios.cmake

@@ -12,12 +12,33 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set(CMAKE_OSX_SYSROOT iphoneos)
-set(CMAKE_OSX_ARCHITECTURES "arm64")
+# Locate gcc
+execute_process(COMMAND /usr/bin/xcrun -sdk iphoneos -find clang
+                OUTPUT_VARIABLE CMAKE_C_COMPILER
+                OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+# Locate g++
+execute_process(COMMAND /usr/bin/xcrun -sdk iphoneos -find clang++
+                OUTPUT_VARIABLE CMAKE_CXX_COMPILER
+                OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+# Set the CMAKE_OSX_SYSROOT to the latest SDK found
+execute_process(COMMAND /usr/bin/xcrun -sdk iphoneos --show-sdk-path
+                OUTPUT_VARIABLE CMAKE_OSX_SYSROOT
+                OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+message(STATUS "gcc found at: ${CMAKE_C_COMPILER}")
+message(STATUS "g++ found at: ${CMAKE_CXX_COMPILER}")
+message(STATUS "Using iOS SDK: ${CMAKE_OSX_SYSROOT}")
+
+set(CMAKE_OSX_ARCHITECTURES "arm64" CACHE STRING "")
 set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos")
 set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
 set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")
 
 # skip TRY_COMPILE checks
 set(CMAKE_CXX_COMPILER_WORKS TRUE)
-set(CMAKE_C_COMPILER_WORKS TRUE)
+set(CMAKE_C_COMPILER_WORKS TRUE)
+
+set(FIREBASE_IOS_BUILD ON CACHE BOOL "")
+set(IOS ON CACHE BOOL "")

ios_pod/CMakeLists.txt

@@ -34,25 +34,15 @@ file(
     "${FIREBASE_POD_DIR}/CMakeLists.txt"
 )
 
-# We use "env -i" to clear the environment variables, and manually keep
-# the PATH to regular bash path.
-# If we didn't do this, we'd end up building for iOS instead of OSX,
-# since the default Xcode environment variables target iOS when you're in
-# an iOS project.
-set(firebase_command_line_path "$ENV{PATH}")
-add_custom_command(
-  # Depend on the lock file, as depending on directories can report false
-  # positives.
-  OUTPUT "${FIREBASE_POD_DIR}/Podfile.lock"
-  COMMAND env -i PATH=${firebase_command_line_path} cmake . -G Xcode &&
-          pod install
-  DEPENDS ${FIREBASE_POD_DIR}/Podfile
-  DEPENDS ${FIREBASE_POD_DIR}/empty.cc
-  DEPENDS ${FIREBASE_POD_DIR}/CMakeLists.txt
-  WORKING_DIRECTORY ${FIREBASE_POD_DIR}
+message("Downloading cocoa pods...")
+
+execute_process(
+  COMMAND /bin/bash -c
+          "mkdir -p ${FIREBASE_POD_DIR} && cd ${FIREBASE_POD_DIR} && cmake . -G Xcode && pod install"
+  OUTPUT_VARIABLE pods_output
 )
 
-add_custom_target(ios_pod_download DEPENDS ${FIREBASE_POD_DIR}/Podfile.lock)
+message("${pods_output}")
 
 set(FIREBASE_POD_DIR ${FIREBASE_POD_DIR} PARENT_SCOPE)
 set(FIREBASE_POD_HEADER_DIR
@@ -78,8 +68,6 @@ function(setup_pod_headers target_name)
   # Parse the arguments into SETUP_POD_HEADERS_POD_NAMES.
   cmake_parse_arguments(SETUP_POD_HEADERS "" "" "${multi}" ${ARGN})
 
-  add_dependencies(${target_name} ios_pod_download)
-
   if(NOT "${SETUP_POD_HEADERS_POD_NAMES}" STREQUAL "")
     foreach (pod ${SETUP_POD_HEADERS_POD_NAMES})
       # Add pod name twice as some frameworks moved includes inside a folder with
@@ -125,8 +113,6 @@ function(symlink_pod_headers target_name pod_name dir_name)
     return()
   endif()
 
-  message(" ## ${target_name} '${glob_dir}'")
-
   add_custom_command(
     OUTPUT "${gen_file}"
     COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/pod_sym_links