2 files changed, 20 insertions, 24 deletions

diff --git a/Firestore/core/test/firebase/firestore/remote/CMakeLists.txt b/Firestore/core/test/firebase/firestore/remote/CMakeLists.txt
index f0731c3..7d99e6f 100644
--- a/Firestore/core/test/firebase/firestore/remote/CMakeLists.txt
+++ b/Firestore/core/test/firebase/firestore/remote/CMakeLists.txt
@@ -14,9 +14,8 @@
 
 cc_test(
   firebase_firestore_remote_test
-  datastore_test.cc
-)
-target_link_libraries(
-  firebase_firestore_remote_test
-  firebase_firestore_remote
+  SOURCES
+    datastore_test.cc
+  DEPENDS
+    firebase_firestore_remote
 )
diff --git a/Firestore/core/test/firebase/firestore/util/CMakeLists.txt b/Firestore/core/test/firebase/firestore/util/CMakeLists.txt
index e51bb51..7f0539c 100644
--- a/Firestore/core/test/firebase/firestore/util/CMakeLists.txt
+++ b/Firestore/core/test/firebase/firestore/util/CMakeLists.txt
@@ -14,33 +14,30 @@
 
 cc_test(
   firebase_firestore_util_test
-  autoid_test.cc
-  secure_random_test.cc
-  string_printf_test.cc
-)
-target_link_libraries(
-  firebase_firestore_util_test
-  firebase_firestore_util
+  SOURCES
+    autoid_test.cc
+    secure_random_test.cc
+    string_printf_test.cc
+  DEPENDS
+    firebase_firestore_util
 )
 
 if(APPLE)
   cc_test(
     firebase_firestore_util_apple_test
-    assert_test.cc
-    log_test.cc
-  )
-  target_link_libraries(
-    firebase_firestore_util_apple_test
-    firebase_firestore_util_apple
+    SOURCES
+      assert_test.cc
+      log_test.cc
+    DEPENDS
+      firebase_firestore_util_apple
   )
 endif(APPLE)
 
 cc_test(
   firebase_firestore_util_stdio_test
-  assert_test.cc
-  log_test.cc
-)
-target_link_libraries(
-  firebase_firestore_util_stdio_test
-  firebase_firestore_util_stdio
+  SOURCES
+    assert_test.cc
+    log_test.cc
+  DEPENDS
+    firebase_firestore_util_stdio
 )