From 50cbfab391f50efd2f2270f24c3ca2e48e039510 Mon Sep 17 00:00:00 2001
From: Gil <mcg@google.com>
Date: Tue, 10 Jul 2018 07:57:54 -0700
Subject: Reorganize cmake dependencies (#1508)

* Add cmake dependencies where required

... instead of relying on a topological sort in the top-level
CMakeLists.txt.

* Add early exits to external project builds
---
 cmake/external/zlib.cmake | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

(limited to 'cmake/external/zlib.cmake')

diff --git a/cmake/external/zlib.cmake b/cmake/external/zlib.cmake
index a90a511..3206f77 100644
--- a/cmake/external/zlib.cmake
+++ b/cmake/external/zlib.cmake
@@ -14,27 +14,31 @@
 
 include(ExternalProject)
 
+if(TARGET zlib)
+  return()
+endif()
+
 # Use a system- or user-supplied zlib if available
 find_package(ZLIB)
 if(ZLIB_FOUND)
   add_custom_target(zlib)
+  return()
+endif()
 
-else()
-  ExternalProject_Add(
-    zlib
+ExternalProject_Add(
+  zlib
 
-    DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
-    DOWNLOAD_NAME zlib-v1.2.11.tar.gz
-    URL https://github.com/madler/zlib/archive/v1.2.11.tar.gz
-    URL_HASH SHA256=629380c90a77b964d896ed37163f5c3a34f6e6d897311f1df2a7016355c45eff
+  DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
+  DOWNLOAD_NAME zlib-v1.2.11.tar.gz
+  URL https://github.com/madler/zlib/archive/v1.2.11.tar.gz
+  URL_HASH SHA256=629380c90a77b964d896ed37163f5c3a34f6e6d897311f1df2a7016355c45eff
 
-    PREFIX ${PROJECT_BINARY_DIR}/external/zlib
+  PREFIX ${PROJECT_BINARY_DIR}/external/zlib
 
-    CMAKE_ARGS
-      -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-      -DCMAKE_INSTALL_PREFIX:STRING=${FIREBASE_INSTALL_DIR}
-      -DBUILD_SHARED_LIBS:BOOL=OFF
+  CMAKE_ARGS
+    -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+    -DCMAKE_INSTALL_PREFIX:STRING=${FIREBASE_INSTALL_DIR}
+    -DBUILD_SHARED_LIBS:BOOL=OFF
 
-    TEST_COMMAND ""
-  )
-endif()
+  TEST_COMMAND ""
+)
-- 
cgit v1.2.3