From 6a3379db62ccbce7fc9a859032955614e78e68bb Mon Sep 17 00:00:00 2001 From: Gil Date: Wed, 17 Jan 2018 10:24:27 -0800 Subject: Add a cc_library to the CMake build (#670) * Rewrite cc_test to take named arguments Cut down on build file verbosity by having cc_test take SOURCES and DEPENDS. The separate invocation of target_link_libraries is no longer necessary. * Add a cc_library rule to parallel cc_test This cuts down on build file verbosity. * Automatically add OBJC_FLAGS to cc_libraries if applicable * Exclude platform-specific libraries from 'all' This is makes it possible to declare this kind of library unconditionally. Usage within a test or as a dependency will actually trigger building. * Restore secure_random_test.cc; clean-up comments --- .../test/firebase/firestore/util/CMakeLists.txt | 35 ++++++++++------------ 1 file changed, 16 insertions(+), 19 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 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 ) -- cgit v1.2.3