From f1fa625b3672872c2b6fc770c0e132ea07b2f047 Mon Sep 17 00:00:00 2001
From: Gil <mcg@google.com>
Date: Tue, 10 Apr 2018 17:51:19 -0700
Subject: Make it easier to consume sub-libraries within util (#1065)

---
 .../test/firebase/firestore/util/CMakeLists.txt    | 54 ++++++++++++----------
 1 file changed, 30 insertions(+), 24 deletions(-)

(limited to 'Firestore/core/test/firebase/firestore/util')

diff --git a/Firestore/core/test/firebase/firestore/util/CMakeLists.txt b/Firestore/core/test/firebase/firestore/util/CMakeLists.txt
index 13482b0..e5dbec5 100644
--- a/Firestore/core/test/firebase/firestore/util/CMakeLists.txt
+++ b/Firestore/core/test/firebase/firestore/util/CMakeLists.txt
@@ -17,26 +17,52 @@ set(CMAKE_CXX_EXTENSIONS ON)
 # Required to allow 0 length printf style strings for testing purposes.
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-format-zero-length")
 
+## assert and log
+
+if(APPLE)
+  cc_test(
+    firebase_firestore_util_log_apple_test
+    SOURCES
+      assert_test.cc
+      log_test.cc
+    DEPENDS
+      firebase_firestore_util_log_apple
+  )
+endif(APPLE)
+
+cc_test(
+  firebase_firestore_util_log_stdio_test
+  SOURCES
+    assert_test.cc
+    log_test.cc
+  DEPENDS
+    firebase_firestore_util_log_stdio
+)
+
+## secure random
+
 if(HAVE_ARC4RANDOM)
   cc_test(
-    firebase_firestore_util_arc4random_test
+    firebase_firestore_util_random_arc4random_test
     SOURCES
       secure_random_test.cc
     DEPENDS
-      firebase_firestore_util_arc4random
+      firebase_firestore_util_random_arc4random
   )
 endif()
 
 if(HAVE_OPENSSL_RAND_H)
   cc_test(
-    firebase_firestore_util_openssl_test
+    firebase_firestore_util_random_openssl_test
     SOURCES
       secure_random_test.cc
     DEPENDS
-      firebase_firestore_util_openssl
+      firebase_firestore_util_random_openssl
   )
 endif()
 
+## main library
+
 cc_test(
   firebase_firestore_util_test
   SOURCES
@@ -56,23 +82,3 @@ cc_test(
     firebase_firestore_util
     gmock
 )
-
-if(APPLE)
-  cc_test(
-    firebase_firestore_util_apple_test
-    SOURCES
-      assert_test.cc
-      log_test.cc
-    DEPENDS
-      firebase_firestore_util_apple
-  )
-endif(APPLE)
-
-cc_test(
-  firebase_firestore_util_stdio_test
-  SOURCES
-    assert_test.cc
-    log_test.cc
-  DEPENDS
-    firebase_firestore_util_stdio
-)
-- 
cgit v1.2.3