From 0f6103e4048242aa066b4ae0e0473578b50b559c Mon Sep 17 00:00:00 2001
From: Gil <mcg@google.com>
Date: Mon, 8 Jan 2018 08:57:36 -0800
Subject: Port StringPrintf from //base (#624)

* Port StringPrintf from //base.

  Prefer this to approaches based on variadic templates. While the variadic
  template mechanisms are strictly safer, they result in binary bloat we
  can't afford.

  This is essentially the same StringPrintf previously open sourced as a
  part of protobuf, though updated for C++11 which saves a copy and a
  temporary buffer on the heap.

* Add abseil as a subdirectory of Firestore

  This saves having to redefine all the libraries that abseil defines as
  imported libraries.

* Rename firebase_firesture_util_log_* targets

  Cut the log out of the name to reflect that these will get more
  components besides just logging.
---
 cmake/external/abseil-cpp.cmake | 35 -----------------------------------
 cmake/external/firestore.cmake  |  2 +-
 2 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 cmake/external/abseil-cpp.cmake

(limited to 'cmake')

diff --git a/cmake/external/abseil-cpp.cmake b/cmake/external/abseil-cpp.cmake
deleted file mode 100644
index d29b7d5..0000000
--- a/cmake/external/abseil-cpp.cmake
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2017 Google
-#
-# 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(source_dir ${PROJECT_SOURCE_DIR}/Firestore/third_party/abseil-cpp)
-set(binary_dir ${PROJECT_BINARY_DIR}/Firestore/third_party/abseil-cpp)
-
-ExternalProject_Add(
-  abseil-cpp
-  DEPENDS googletest
-
-  PREFIX "${binary_dir}"
-  SOURCE_DIR "${source_dir}"
-  BINARY_DIR "${binary_dir}"
-
-  INSTALL_DIR "${FIREBASE_INSTALL_DIR}"
-  INSTALL_COMMAND ""
-  TEST_BEFORE_INSTALL ON
-
-  CMAKE_ARGS
-      -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-      -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-)
diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake
index 61f79f3..1abb629 100644
--- a/cmake/external/firestore.cmake
+++ b/cmake/external/firestore.cmake
@@ -19,7 +19,7 @@ set(binary_dir ${PROJECT_BINARY_DIR}/Firestore)
 
 ExternalProject_Add(
   Firestore
-  DEPENDS abseil-cpp FirebaseCore googletest leveldb
+  DEPENDS FirebaseCore googletest leveldb
 
   # Lay the binary directory out as if this were a subproject. This makes it
   # possible to build and test in it directly.
-- 
cgit v1.2.3