Use external repo for GoogleUtilities cmake build (#7324)

Author: paulb777

CMakeLists.txt

@@ -264,6 +264,5 @@ endif()
 
 add_subdirectory(FirebaseCore)
 add_subdirectory(Firestore)
-add_subdirectory(GoogleUtilities)
 add_subdirectory(Interop/Auth)
 add_subdirectory(Interop/CoreDiagnostics)

FirebaseCore/CMakeLists.txt

@@ -16,6 +16,9 @@ if(NOT APPLE)
   return()
 endif()
 
+# GoogleUtilities is an external dependency without its own cmake configuration.
+include(GoogleUtilities)
+
 file(GLOB headers Sources/Private/*.h Sources/Public/FirebaseCore/*.h)
 file(GLOB sources Sources/*.m)
 

GoogleUtilities/CMakeLists.txt renamed to cmake/GoogleUtilities.cmake

@@ -19,14 +19,14 @@ endif()
 # Environment and Logger subspecs
 file(
   GLOB sources
-  Environment/*.m
-  Environment/third_party/*.m
-  Logger/*.m
+  ${FIREBASE_EXTERNAL_SOURCE_DIR}/GoogleUtilities/GoogleUtilities/Environment/*.m
+  ${FIREBASE_EXTERNAL_SOURCE_DIR}/GoogleUtilities/GoogleUtilities/Environment/third_party/*.m
+  ${FIREBASE_EXTERNAL_SOURCE_DIR}/GoogleUtilities/GoogleUtilities/Logger/*.m
 )
 file(
   GLOB headers
-  Environment/Public/GoogleUtilities/*.h
-  Logger/Public/GoogleUtilities/*.h
+  ${FIREBASE_EXTERNAL_SOURCE_DIR}/GoogleUtilities/GoogleUtilities/Environment/Public/GoogleUtilities/*.h
+  ${FIREBASE_EXTERNAL_SOURCE_DIR}/GoogleUtilities/GoogleUtilities/Logger/Public/GoogleUtilities/*.h
 )
 
 firebase_ios_add_framework(

cmake/external/CMakeLists.txt

@@ -28,6 +28,7 @@ include(benchmark)
 include(boringssl)
 include(c-ares)
 include(googletest)
+include(GoogleUtilities)
 include(grpc)
 include(leveldb)
 include(libfuzzer)

cmake/external/GoogleUtilities.cmake

@@ -0,0 +1,33 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+include(ExternalProject)
+
+set(version 7.2.0)
+
+ExternalProject_Add(
+  GoogleUtilities
+
+  DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
+  DOWNLOAD_NAME GoogleUtilities-${version}.tar.gz
+  URL https://github.com/google/GoogleUtilities/archive/${version}.tar.gz
+  URL_HASH SHA256=93c92b28c49b8f7e8cccc2cefe6411fad6e68cbf9638422d3e7ca537cca881a8
+
+  PREFIX ${PROJECT_BINARY_DIR}
+
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ""
+  INSTALL_COMMAND ""
+  TEST_COMMAND ""
+)