From 3693d70a24fe45fd985b04f9acde5db9f01136c2 Mon Sep 17 00:00:00 2001 From: Marek Gilbert Date: Wed, 6 Dec 2017 09:22:18 -0800 Subject: Remove use of absl::synchronization_internal::ThreadPool --- Firestore/third_party/abseil-cpp/absl/base/config_test.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Firestore/third_party') diff --git a/Firestore/third_party/abseil-cpp/absl/base/config_test.cc b/Firestore/third_party/abseil-cpp/absl/base/config_test.cc index c839712..83d45b7 100644 --- a/Firestore/third_party/abseil-cpp/absl/base/config_test.cc +++ b/Firestore/third_party/abseil-cpp/absl/base/config_test.cc @@ -17,7 +17,7 @@ #include #include "gtest/gtest.h" -#include "absl/synchronization/internal/thread_pool.h" +// #include "absl/synchronization/internal/thread_pool.h" namespace { @@ -41,6 +41,7 @@ TEST(ConfigTest, Endianness) { #endif } +#if 0 #if defined(ABSL_HAVE_THREAD_LOCAL) TEST(ConfigTest, ThreadLocal) { static thread_local int mine_mine_mine = 16; @@ -56,5 +57,6 @@ TEST(ConfigTest, ThreadLocal) { EXPECT_EQ(16, mine_mine_mine); } #endif +#endif // 0 } // namespace -- cgit v1.2.3 From 1641a0d791719c8e0e1fe206e067b4842ca657d2 Mon Sep 17 00:00:00 2001 From: Marek Gilbert Date: Wed, 6 Dec 2017 09:23:03 -0800 Subject: Consume googletest in the standard CMake way --- Firestore/third_party/abseil-cpp/CMakeLists.txt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'Firestore/third_party') diff --git a/Firestore/third_party/abseil-cpp/CMakeLists.txt b/Firestore/third_party/abseil-cpp/CMakeLists.txt index e87f4a8..0da6c42 100644 --- a/Firestore/third_party/abseil-cpp/CMakeLists.txt +++ b/Firestore/third_party/abseil-cpp/CMakeLists.txt @@ -53,15 +53,17 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_WARNING_VLA} ${CMAKE_CXX_FLAGS} ") ## pthread find_package(Threads REQUIRED) +find_package(GTest REQUIRED) + # commented: used only for standalone test #add_subdirectory(cctz) #add_subdirectory(googletest) ## check targets -check_target(cctz) -check_target(gtest) -check_target(gtest_main) -check_target(gmock) +#check_target(cctz) +#check_target(gtest) +#check_target(gtest_main) +#check_target(gmock) # -fexceptions set(ABSL_EXCEPTIONS_FLAG "${CMAKE_CXX_EXCEPTIONS}") @@ -70,9 +72,9 @@ set(ABSL_EXCEPTIONS_FLAG "${CMAKE_CXX_EXCEPTIONS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FIX_MSVC} ${CMAKE_CXX_FLAGS}") list(APPEND ABSL_TEST_COMMON_LIBRARIES - gtest_main - gtest - gmock + GTest::Main + GTest::GTest + #GMock::GMock ${CMAKE_THREAD_LIBS_INIT} ) -- cgit v1.2.3 From 36cd94a04fa15a5b85e7156bd070f157306522b9 Mon Sep 17 00:00:00 2001 From: Marek Gilbert Date: Wed, 6 Dec 2017 09:23:55 -0800 Subject: Cut down absl CMakeLists to only include the things we use --- .../third_party/abseil-cpp/absl/CMakeLists.txt | 18 +- .../abseil-cpp/absl/base/CMakeLists.txt | 454 ++++++++++----------- .../abseil-cpp/absl/strings/CMakeLists.txt | 335 ++++++++------- 3 files changed, 399 insertions(+), 408 deletions(-) (limited to 'Firestore/third_party') diff --git a/Firestore/third_party/abseil-cpp/absl/CMakeLists.txt b/Firestore/third_party/abseil-cpp/absl/CMakeLists.txt index 689f64e..c909ba0 100644 --- a/Firestore/third_party/abseil-cpp/absl/CMakeLists.txt +++ b/Firestore/third_party/abseil-cpp/absl/CMakeLists.txt @@ -17,14 +17,14 @@ add_subdirectory(base) -add_subdirectory(algorithm) -add_subdirectory(container) -add_subdirectory(debugging) -add_subdirectory(memory) +#add_subdirectory(algorithm) +#add_subdirectory(container) +#add_subdirectory(debugging) +#add_subdirectory(memory) add_subdirectory(meta) -add_subdirectory(numeric) +#add_subdirectory(numeric) add_subdirectory(strings) -add_subdirectory(synchronization) -add_subdirectory(time) -add_subdirectory(types) -add_subdirectory(utility) +#add_subdirectory(synchronization) +#add_subdirectory(time) +#add_subdirectory(types) +#add_subdirectory(utility) diff --git a/Firestore/third_party/abseil-cpp/absl/base/CMakeLists.txt b/Firestore/third_party/abseil-cpp/absl/base/CMakeLists.txt index 3e94d51..1adc249 100644 --- a/Firestore/third_party/abseil-cpp/absl/base/CMakeLists.txt +++ b/Firestore/third_party/abseil-cpp/absl/base/CMakeLists.txt @@ -16,57 +16,57 @@ list(APPEND BASE_PUBLIC_HEADERS "attributes.h" - "call_once.h" - "casts.h" +# "call_once.h" +# "casts.h" "config.h" "dynamic_annotations.h" "macros.h" "optimization.h" "policy_checks.h" "port.h" - "thread_annotations.h" +# "thread_annotations.h" ) list(APPEND BASE_INTERNAL_HEADERS "internal/atomic_hook.h" - "internal/cycleclock.h" - "internal/endian.h" - "internal/exception_testing.h" - "internal/identity.h" - "internal/invoke.h" +# "internal/cycleclock.h" +# "internal/endian.h" +# "internal/exception_testing.h" +# "internal/identity.h" +# "internal/invoke.h" "internal/log_severity.h" - "internal/low_level_alloc.h" - "internal/low_level_scheduling.h" - "internal/malloc_extension_c.h" - "internal/malloc_extension.h" - "internal/malloc_hook_c.h" - "internal/malloc_hook.h" - "internal/malloc_hook_invoke.h" - "internal/per_thread_tls.h" +# "internal/low_level_alloc.h" +# "internal/low_level_scheduling.h" +# "internal/malloc_extension_c.h" +# "internal/malloc_extension.h" +# "internal/malloc_hook_c.h" +# "internal/malloc_hook.h" +# "internal/malloc_hook_invoke.h" +# "internal/per_thread_tls.h" "internal/raw_logging.h" - "internal/scheduling_mode.h" - "internal/spinlock.h" - "internal/spinlock_wait.h" - "internal/sysinfo.h" - "internal/thread_identity.h" +# "internal/scheduling_mode.h" +# "internal/spinlock.h" +# "internal/spinlock_wait.h" +# "internal/sysinfo.h" +# "internal/thread_identity.h" "internal/throw_delegate.h" - "internal/tsan_mutex_interface.h" - "internal/unaligned_access.h" - "internal/unscaledcycleclock.h" +# "internal/tsan_mutex_interface.h" +# "internal/unaligned_access.h" +# "internal/unscaledcycleclock.h" ) # absl_base main library list(APPEND BASE_SRC - "internal/cycleclock.cc" +# "internal/cycleclock.cc" "internal/raw_logging.cc" - "internal/spinlock.cc" - "internal/sysinfo.cc" - "internal/thread_identity.cc" - "internal/unscaledcycleclock.cc" - "internal/low_level_alloc.cc" - "internal/malloc_hook.cc" +# "internal/spinlock.cc" +# "internal/sysinfo.cc" +# "internal/thread_identity.cc" +# "internal/unscaledcycleclock.cc" +# "internal/low_level_alloc.cc" +# "internal/malloc_hook.cc" ${BASE_PUBLIC_HEADERS} ${BASE_INTERNAL_HEADERS} ) @@ -78,25 +78,25 @@ absl_library( ${BASE_SRC} PUBLIC_LIBRARIES absl_dynamic_annotations - absl_spinlock_wait +# absl_spinlock_wait EXPORT_NAME base ) -# malloc extension library -set(MALLOC_EXTENSION_SRC "internal/malloc_extension.cc") -set(MALLOC_EXTENSION_PUBLIC_LIBRARIES absl::base) - -absl_library( - TARGET - absl_malloc_extension - SOURCES - ${MALLOC_EXTENSION_SRC} - PUBLIC_LIBRARIES - ${MALLOC_EXTENSION_PUBLIC_LIBRARIES} - EXPORT_NAME - malloc_extension -) +## malloc extension library +#set(MALLOC_EXTENSION_SRC "internal/malloc_extension.cc") +#set(MALLOC_EXTENSION_PUBLIC_LIBRARIES absl::base) +# +#absl_library( +# TARGET +# absl_malloc_extension +# SOURCES +# ${MALLOC_EXTENSION_SRC} +# PUBLIC_LIBRARIES +# ${MALLOC_EXTENSION_PUBLIC_LIBRARIES} +# EXPORT_NAME +# malloc_extension +#) # throw delegate library set(THROW_DELEGATE_SRC "internal/throw_delegate.cc") @@ -126,134 +126,134 @@ absl_library( ) -# spinlock_wait library -set(SPINLOCK_WAIT_SRC "internal/spinlock_wait.cc") - -absl_library( - TARGET - absl_spinlock_wait - SOURCES - ${SPINLOCK_WAIT_SRC} -) - - -# malloc_internal library -list(APPEND MALLOC_INTERNAL_SRC - "internal/low_level_alloc.cc" - "internal/malloc_hook.cc" - "internal/malloc_hook_mmap_linux.inc" -) - -absl_library( - TARGET - absl_malloc_internal - SOURCES - ${MALLOC_INTERNAL_SRC} - PUBLIC_LIBRARIES - absl_dynamic_annotations -) - - - +## spinlock_wait library +#set(SPINLOCK_WAIT_SRC "internal/spinlock_wait.cc") # -## TESTS +#absl_library( +# TARGET +# absl_spinlock_wait +# SOURCES +# ${SPINLOCK_WAIT_SRC} +#) # - -# call once test -set(CALL_ONCE_TEST_SRC "call_once_test.cc") -set(CALL_ONCE_TEST_PUBLIC_LIBRARIES absl::base absl::synchronization) - -absl_test( - TARGET - call_once_test - SOURCES - ${CALL_ONCE_TEST_SRC} - PUBLIC_LIBRARIES - ${CALL_ONCE_TEST_PUBLIC_LIBRARIES} -) - - -# test bit_cast_test -set(BIT_CAST_TEST_SRC "bit_cast_test.cc") - -absl_test( - TARGET - bit_cast_test - SOURCES - ${BIT_CAST_TEST_SRC} -) - - -# test absl_throw_delegate_test -set(THROW_DELEGATE_TEST_SRC "throw_delegate_test.cc") -set(THROW_DELEGATE_TEST_PUBLIC_LIBRARIES absl::base absl_throw_delegate) - -absl_test( - TARGET - throw_delegate_test - SOURCES - ${THROW_DELEGATE_TEST_SRC} - PUBLIC_LIBRARIES - ${THROW_DELEGATE_TEST_PUBLIC_LIBRARIES} -) - - -# test invoke_test -set(INVOKE_TEST_SRC "invoke_test.cc") -set(INVOKE_TEST_PUBLIC_LIBRARIES absl::strings) - -absl_test( - TARGET - invoke_test - SOURCES - ${INVOKE_TEST_SRC} - PUBLIC_LIBRARIES - ${INVOKE_TEST_PUBLIC_LIBRARIES} -) - - -# test spinlock_test_common -set(SPINLOCK_TEST_COMMON_SRC "spinlock_test_common.cc") -set(SPINLOCK_TEST_COMMON_PUBLIC_LIBRARIES absl::base absl::synchronization) - -absl_test( - TARGET - spinlock_test_common - SOURCES - ${SPINLOCK_TEST_COMMON_SRC} - PUBLIC_LIBRARIES - ${SPINLOCK_TEST_COMMON_PUBLIC_LIBRARIES} -) - - -# test spinlock_test -set(SPINLOCK_TEST_SRC "spinlock_test_common.cc") -set(SPINLOCK_TEST_PUBLIC_LIBRARIES absl::base absl::synchronization) - -absl_test( - TARGET - spinlock_test - SOURCES - ${SPINLOCK_TEST_SRC} - PUBLIC_LIBRARIES - ${SPINLOCK_TEST_PUBLIC_LIBRARIES} -) - - -# test endian_test -set(ENDIAN_TEST_SRC "internal/endian_test.cc") - -absl_test( - TARGET - endian_test - SOURCES - ${ENDIAN_TEST_SRC} -) +# +## malloc_internal library +#list(APPEND MALLOC_INTERNAL_SRC +# "internal/low_level_alloc.cc" +# "internal/malloc_hook.cc" +# "internal/malloc_hook_mmap_linux.inc" +#) +# +#absl_library( +# TARGET +# absl_malloc_internal +# SOURCES +# ${MALLOC_INTERNAL_SRC} +# PUBLIC_LIBRARIES +# absl_dynamic_annotations +#) +# +# +# +## +### TESTS +## +# +## call once test +#set(CALL_ONCE_TEST_SRC "call_once_test.cc") +#set(CALL_ONCE_TEST_PUBLIC_LIBRARIES absl::base absl::synchronization) +# +#absl_test( +# TARGET +# call_once_test +# SOURCES +# ${CALL_ONCE_TEST_SRC} +# PUBLIC_LIBRARIES +# ${CALL_ONCE_TEST_PUBLIC_LIBRARIES} +#) +# +# +## test bit_cast_test +#set(BIT_CAST_TEST_SRC "bit_cast_test.cc") +# +#absl_test( +# TARGET +# bit_cast_test +# SOURCES +# ${BIT_CAST_TEST_SRC} +#) +# +# +## test absl_throw_delegate_test +#set(THROW_DELEGATE_TEST_SRC "throw_delegate_test.cc") +#set(THROW_DELEGATE_TEST_PUBLIC_LIBRARIES absl::base absl_throw_delegate) +# +#absl_test( +# TARGET +# throw_delegate_test +# SOURCES +# ${THROW_DELEGATE_TEST_SRC} +# PUBLIC_LIBRARIES +# ${THROW_DELEGATE_TEST_PUBLIC_LIBRARIES} +#) +# +# +## test invoke_test +#set(INVOKE_TEST_SRC "invoke_test.cc") +#set(INVOKE_TEST_PUBLIC_LIBRARIES absl::strings) +# +#absl_test( +# TARGET +# invoke_test +# SOURCES +# ${INVOKE_TEST_SRC} +# PUBLIC_LIBRARIES +# ${INVOKE_TEST_PUBLIC_LIBRARIES} +#) +# +# +## test spinlock_test_common +#set(SPINLOCK_TEST_COMMON_SRC "spinlock_test_common.cc") +#set(SPINLOCK_TEST_COMMON_PUBLIC_LIBRARIES absl::base absl::synchronization) +# +#absl_test( +# TARGET +# spinlock_test_common +# SOURCES +# ${SPINLOCK_TEST_COMMON_SRC} +# PUBLIC_LIBRARIES +# ${SPINLOCK_TEST_COMMON_PUBLIC_LIBRARIES} +#) +# +# +## test spinlock_test +#set(SPINLOCK_TEST_SRC "spinlock_test_common.cc") +#set(SPINLOCK_TEST_PUBLIC_LIBRARIES absl::base absl::synchronization) +# +#absl_test( +# TARGET +# spinlock_test +# SOURCES +# ${SPINLOCK_TEST_SRC} +# PUBLIC_LIBRARIES +# ${SPINLOCK_TEST_PUBLIC_LIBRARIES} +#) +# +# +## test endian_test +#set(ENDIAN_TEST_SRC "internal/endian_test.cc") +# +#absl_test( +# TARGET +# endian_test +# SOURCES +# ${ENDIAN_TEST_SRC} +#) # test config_test set(CONFIG_TEST_SRC "config_test.cc") -set(CONFIG_TEST_PUBLIC_LIBRARIES absl::base absl::synchronization) +set(CONFIG_TEST_PUBLIC_LIBRARIES absl::base) absl_test( TARGET config_test @@ -278,64 +278,60 @@ absl_test( ) -# test sysinfo_test -set(SYSINFO_TEST_SRC "internal/sysinfo_test.cc") -set(SYSINFO_TEST_PUBLIC_LIBRARIES absl::base absl::synchronization) - -absl_test( - TARGET - sysinfo_test - SOURCES - ${SYSINFO_TEST_SRC} - PUBLIC_LIBRARIES - ${SYSINFO_TEST_PUBLIC_LIBRARIES} -) - - -# test low_level_alloc_test -set(LOW_LEVEL_ALLOC_TEST_SRC "internal/low_level_alloc_test.cc") -set(LOW_LEVEL_ALLOC_TEST_PUBLIC_LIBRARIES absl::base) - -absl_test( - TARGET - low_level_alloc_test - SOURCES - ${LOW_LEVEL_ALLOC_TEST_SRC} - PUBLIC_LIBRARIES - ${LOW_LEVEL_ALLOC_TEST_PUBLIC_LIBRARIES} -) - - -# test thread_identity_test -set(THREAD_IDENTITY_TEST_SRC "internal/thread_identity_test.cc") -set(THREAD_IDENTITY_TEST_PUBLIC_LIBRARIES absl::base absl::synchronization) - -absl_test( - TARGET - thread_identity_test - SOURCES - ${THREAD_IDENTITY_TEST_SRC} - PUBLIC_LIBRARIES - ${THREAD_IDENTITY_TEST_PUBLIC_LIBRARIES} -) - - -# test absl_malloc_extension_system_malloc_test -set(MALLOC_EXTENSION_SYSTEM_MALLOC_TEST_SRC "internal/malloc_extension_test.cc") -set(MALLOC_EXTENSION_SYSTEM_MALLOC_TEST_PUBLIC_LIBRARIES absl::base absl_malloc_extension) -set(MALLOC_EXTENSION_SYSTEM_MALLOC_TEST_PRIVATE_COMPILE_FLAGS "-DABSL_MALLOC_EXTENSION_TEST_ALLOW_MISSING_EXTENSION=1") - -absl_test( - TARGET - absl_malloc_extension_system_malloc_test - SOURCES - ${MALLOC_EXTENSION_SYSTEM_MALLOC_TEST_SRC} - PUBLIC_LIBRARIES - ${MALLOC_EXTENSION_SYSTEM_MALLOC_TEST_PUBLIC_LIBRARIES} - PRIVATE_COMPILE_FLAGS - ${MALLOC_EXTENSION_SYSTEM_MALLOC_TEST_PRIVATE_COMPILE_FLAGS} -) - - - - +## test sysinfo_test +#set(SYSINFO_TEST_SRC "internal/sysinfo_test.cc") +#set(SYSINFO_TEST_PUBLIC_LIBRARIES absl::base absl::synchronization) +# +#absl_test( +# TARGET +# sysinfo_test +# SOURCES +# ${SYSINFO_TEST_SRC} +# PUBLIC_LIBRARIES +# ${SYSINFO_TEST_PUBLIC_LIBRARIES} +#) +# +# +## test low_level_alloc_test +#set(LOW_LEVEL_ALLOC_TEST_SRC "internal/low_level_alloc_test.cc") +#set(LOW_LEVEL_ALLOC_TEST_PUBLIC_LIBRARIES absl::base) +# +#absl_test( +# TARGET +# low_level_alloc_test +# SOURCES +# ${LOW_LEVEL_ALLOC_TEST_SRC} +# PUBLIC_LIBRARIES +# ${LOW_LEVEL_ALLOC_TEST_PUBLIC_LIBRARIES} +#) +# +# +## test thread_identity_test +#set(THREAD_IDENTITY_TEST_SRC "internal/thread_identity_test.cc") +#set(THREAD_IDENTITY_TEST_PUBLIC_LIBRARIES absl::base absl::synchronization) +# +#absl_test( +# TARGET +# thread_identity_test +# SOURCES +# ${THREAD_IDENTITY_TEST_SRC} +# PUBLIC_LIBRARIES +# ${THREAD_IDENTITY_TEST_PUBLIC_LIBRARIES} +#) +# +# +## test absl_malloc_extension_system_malloc_test +#set(MALLOC_EXTENSION_SYSTEM_MALLOC_TEST_SRC "internal/malloc_extension_test.cc") +#set(MALLOC_EXTENSION_SYSTEM_MALLOC_TEST_PUBLIC_LIBRARIES absl::base absl_malloc_extension) +#set(MALLOC_EXTENSION_SYSTEM_MALLOC_TEST_PRIVATE_COMPILE_FLAGS "-DABSL_MALLOC_EXTENSION_TEST_ALLOW_MISSING_EXTENSION=1") +# +#absl_test( +# TARGET +# absl_malloc_extension_system_malloc_test +# SOURCES +# ${MALLOC_EXTENSION_SYSTEM_MALLOC_TEST_SRC} +# PUBLIC_LIBRARIES +# ${MALLOC_EXTENSION_SYSTEM_MALLOC_TEST_PUBLIC_LIBRARIES} +# PRIVATE_COMPILE_FLAGS +# ${MALLOC_EXTENSION_SYSTEM_MALLOC_TEST_PRIVATE_COMPILE_FLAGS} +#) diff --git a/Firestore/third_party/abseil-cpp/absl/strings/CMakeLists.txt b/Firestore/third_party/abseil-cpp/absl/strings/CMakeLists.txt index dcd4974..2babc9f 100644 --- a/Firestore/third_party/abseil-cpp/absl/strings/CMakeLists.txt +++ b/Firestore/third_party/abseil-cpp/absl/strings/CMakeLists.txt @@ -17,27 +17,27 @@ list(APPEND STRINGS_PUBLIC_HEADERS "ascii.h" - "escaping.h" +# "escaping.h" "match.h" - "numbers.h" - "str_cat.h" +# "numbers.h" +# "str_cat.h" "string_view.h" - "strip.h" - "str_join.h" - "str_replace.h" - "str_split.h" - "substitute.h" +# "strip.h" +# "str_join.h" +# "str_replace.h" +# "str_split.h" +# "substitute.h" ) list(APPEND STRINGS_INTERNAL_HEADERS - "internal/char_map.h" +# "internal/char_map.h" "internal/memutil.h" - "internal/ostringstream.h" +# "internal/ostringstream.h" "internal/resize_uninitialized.h" - "internal/str_join_internal.h" - "internal/str_split_internal.h" - "internal/utf8.h" +# "internal/str_join_internal.h" +# "internal/str_split_internal.h" +# "internal/utf8.h" ) @@ -45,17 +45,16 @@ list(APPEND STRINGS_INTERNAL_HEADERS # add string library list(APPEND STRINGS_SRC "ascii.cc" - "escaping.cc" +# "escaping.cc" "internal/memutil.cc" - "internal/memutil.h" - "internal/utf8.cc" +# "internal/utf8.cc" "match.cc" - "numbers.cc" - "str_cat.cc" - "str_replace.cc" - "str_split.cc" +# "numbers.cc" +# "str_cat.cc" +# "str_replace.cc" +# "str_split.cc" "string_view.cc" - "substitute.cc" +# "substitute.cc" ${STRINGS_PUBLIC_HEADERS} ${STRINGS_INTERNAL_HEADERS} ) @@ -91,18 +90,18 @@ absl_test( ) -# test escaping_test -set(ESCAPING_TEST_SRC "escaping_test.cc") -set(ESCAPING_TEST_PUBLIC_LIBRARIES absl::strings absl::base) - -absl_test( - TARGET - escaping_test - SOURCES - ${ESCAPING_TEST_SRC} - PUBLIC_LIBRARIES - ${ESCAPING_TEST_PUBLIC_LIBRARIES} -) +## test escaping_test +#set(ESCAPING_TEST_SRC "escaping_test.cc") +#set(ESCAPING_TEST_PUBLIC_LIBRARIES absl::strings absl::base) +# +#absl_test( +# TARGET +# escaping_test +# SOURCES +# ${ESCAPING_TEST_SRC} +# PUBLIC_LIBRARIES +# ${ESCAPING_TEST_PUBLIC_LIBRARIES} +#) # test ascii_test @@ -133,20 +132,20 @@ absl_test( ) -# test utf8_test -set(UTF8_TEST_SRC "internal/utf8_test.cc") -set(UTF8_TEST_PUBLIC_LIBRARIES absl::strings absl::base) - -absl_test( - TARGET - utf8_test - SOURCES - ${UTF8_TEST_SRC} - PUBLIC_LIBRARIES - ${UTF8_TEST_PUBLIC_LIBRARIES} -) - - +## test utf8_test +#set(UTF8_TEST_SRC "internal/utf8_test.cc") +#set(UTF8_TEST_PUBLIC_LIBRARIES absl::strings absl::base) +# +#absl_test( +# TARGET +# utf8_test +# SOURCES +# ${UTF8_TEST_SRC} +# PUBLIC_LIBRARIES +# ${UTF8_TEST_PUBLIC_LIBRARIES} +#) +# +# # test string_view_test set(STRING_VIEW_TEST_SRC "string_view_test.cc") set(STRING_VIEW_TEST_PUBLIC_LIBRARIES absl::strings absl_throw_delegate absl::base) @@ -161,57 +160,57 @@ absl_test( ) -# test substitute_test -set(SUBSTITUTE_TEST_SRC "substitute_test.cc") -set(SUBSTITUTE_TEST_PUBLIC_LIBRARIES absl::strings absl::base) - -absl_test( - TARGET - substitute_test - SOURCES - ${SUBSTITUTE_TEST_SRC} - PUBLIC_LIBRARIES - ${SUBSTITUTE_TEST_PUBLIC_LIBRARIES} -) - - -# test str_replace_test -set(STR_REPLACE_TEST_SRC "str_replace_test.cc") -set(STR_REPLACE_TEST_PUBLIC_LIBRARIES absl::strings absl::base absl_throw_delegate) - -absl_test( - TARGET - str_replace_test - SOURCES - ${STR_REPLACE_TEST_SRC} - PUBLIC_LIBRARIES - ${STR_REPLACE_TEST_PUBLIC_LIBRARIES} -) - - -# test str_split_test -set(STR_SPLIT_TEST_SRC "str_split_test.cc") -set(STR_SPLIT_TEST_PUBLIC_LIBRARIES absl::strings absl::base absl_throw_delegate) - -absl_test( - TARGET - str_split_test - SOURCES - ${STR_SPLIT_TEST_SRC} - PUBLIC_LIBRARIES - ${STR_SPLIT_TEST_PUBLIC_LIBRARIES} -) - - -# test ostringstream_test -set(OSTRINGSTREAM_TEST_SRC "internal/ostringstream_test.cc") - -absl_test( - TARGET - ostringstream_test - SOURCES - ${OSTRINGSTREAM_TEST_SRC} -) +## test substitute_test +#set(SUBSTITUTE_TEST_SRC "substitute_test.cc") +#set(SUBSTITUTE_TEST_PUBLIC_LIBRARIES absl::strings absl::base) +# +#absl_test( +# TARGET +# substitute_test +# SOURCES +# ${SUBSTITUTE_TEST_SRC} +# PUBLIC_LIBRARIES +# ${SUBSTITUTE_TEST_PUBLIC_LIBRARIES} +#) +# +# +## test str_replace_test +#set(STR_REPLACE_TEST_SRC "str_replace_test.cc") +#set(STR_REPLACE_TEST_PUBLIC_LIBRARIES absl::strings absl::base absl_throw_delegate) +# +#absl_test( +# TARGET +# str_replace_test +# SOURCES +# ${STR_REPLACE_TEST_SRC} +# PUBLIC_LIBRARIES +# ${STR_REPLACE_TEST_PUBLIC_LIBRARIES} +#) +# +# +## test str_split_test +#set(STR_SPLIT_TEST_SRC "str_split_test.cc") +#set(STR_SPLIT_TEST_PUBLIC_LIBRARIES absl::strings absl::base absl_throw_delegate) +# +#absl_test( +# TARGET +# str_split_test +# SOURCES +# ${STR_SPLIT_TEST_SRC} +# PUBLIC_LIBRARIES +# ${STR_SPLIT_TEST_PUBLIC_LIBRARIES} +#) +# +# +## test ostringstream_test +#set(OSTRINGSTREAM_TEST_SRC "internal/ostringstream_test.cc") +# +#absl_test( +# TARGET +# ostringstream_test +# SOURCES +# ${OSTRINGSTREAM_TEST_SRC} +#) # test resize_uninitialized_test @@ -225,75 +224,71 @@ absl_test( ) -# test str_join_test -set(STR_JOIN_TEST_SRC "str_join_test.cc") -set(STR_JOIN_TEST_PUBLIC_LIBRARIES absl::strings) - -absl_test( - TARGET - str_join_test - SOURCES - ${STR_JOIN_TEST_SRC} - PUBLIC_LIBRARIES - ${STR_JOIN_TEST_PUBLIC_LIBRARIES} -) - - -# test str_cat_test -set(STR_CAT_TEST_SRC "str_cat_test.cc") -set(STR_CAT_TEST_PUBLIC_LIBRARIES absl::strings) - -absl_test( - TARGET - str_cat_test - SOURCES - ${STR_CAT_TEST_SRC} - PUBLIC_LIBRARIES - ${STR_CAT_TEST_PUBLIC_LIBRARIES} -) - - -# test numbers_test -set(NUMBERS_TEST_SRC "numbers_test.cc") -set(NUMBERS_TEST_PUBLIC_LIBRARIES absl::strings) - -absl_test( - TARGET - numbers_test - SOURCES - ${NUMBERS_TEST_SRC} - PUBLIC_LIBRARIES - ${NUMBERS_TEST_PUBLIC_LIBRARIES} -) - - -# test strip_test -set(STRIP_TEST_SRC "strip_test.cc") -set(STRIP_TEST_PUBLIC_LIBRARIES absl::strings) - -absl_test( - TARGET - strip_test - SOURCES - ${STRIP_TEST_SRC} - PUBLIC_LIBRARIES - ${STRIP_TEST_PUBLIC_LIBRARIES} -) - - -# test char_map_test -set(CHAR_MAP_TEST_SRC "internal/char_map_test.cc") -set(CHAR_MAP_TEST_PUBLIC_LIBRARIES absl::strings) - -absl_test( - TARGET - char_map_test - SOURCES - ${CHAR_MAP_TEST_SRC} - PUBLIC_LIBRARIES - ${CHAR_MAP_TEST_PUBLIC_LIBRARIES} -) - - - - +## test str_join_test +#set(STR_JOIN_TEST_SRC "str_join_test.cc") +#set(STR_JOIN_TEST_PUBLIC_LIBRARIES absl::strings) +# +#absl_test( +# TARGET +# str_join_test +# SOURCES +# ${STR_JOIN_TEST_SRC} +# PUBLIC_LIBRARIES +# ${STR_JOIN_TEST_PUBLIC_LIBRARIES} +#) +# +# +## test str_cat_test +#set(STR_CAT_TEST_SRC "str_cat_test.cc") +#set(STR_CAT_TEST_PUBLIC_LIBRARIES absl::strings) +# +#absl_test( +# TARGET +# str_cat_test +# SOURCES +# ${STR_CAT_TEST_SRC} +# PUBLIC_LIBRARIES +# ${STR_CAT_TEST_PUBLIC_LIBRARIES} +#) +# +# +## test numbers_test +#set(NUMBERS_TEST_SRC "numbers_test.cc") +#set(NUMBERS_TEST_PUBLIC_LIBRARIES absl::strings) +# +#absl_test( +# TARGET +# numbers_test +# SOURCES +# ${NUMBERS_TEST_SRC} +# PUBLIC_LIBRARIES +# ${NUMBERS_TEST_PUBLIC_LIBRARIES} +#) +# +# +## test strip_test +#set(STRIP_TEST_SRC "strip_test.cc") +#set(STRIP_TEST_PUBLIC_LIBRARIES absl::strings) +# +#absl_test( +# TARGET +# strip_test +# SOURCES +# ${STRIP_TEST_SRC} +# PUBLIC_LIBRARIES +# ${STRIP_TEST_PUBLIC_LIBRARIES} +#) +# +# +## test char_map_test +#set(CHAR_MAP_TEST_SRC "internal/char_map_test.cc") +#set(CHAR_MAP_TEST_PUBLIC_LIBRARIES absl::strings) +# +#absl_test( +# TARGET +# char_map_test +# SOURCES +# ${CHAR_MAP_TEST_SRC} +# PUBLIC_LIBRARIES +# ${CHAR_MAP_TEST_PUBLIC_LIBRARIES} +#) -- cgit v1.2.3 From e00d46e8c94a2703d2bd58493e4bb45d0d581005 Mon Sep 17 00:00:00 2001 From: Marek Gilbert Date: Thu, 7 Dec 2017 17:33:57 -0800 Subject: Remove commented out code --- Firestore/third_party/abseil-cpp/CMakeLists.txt | 11 - .../third_party/abseil-cpp/absl/CMakeLists.txt | 9 - .../abseil-cpp/absl/base/CMakeLists.txt | 228 +-------------------- .../abseil-cpp/absl/base/config_test.cc | 19 -- .../abseil-cpp/absl/strings/CMakeLists.txt | 171 ---------------- 5 files changed, 1 insertion(+), 437 deletions(-) (limited to 'Firestore/third_party') diff --git a/Firestore/third_party/abseil-cpp/CMakeLists.txt b/Firestore/third_party/abseil-cpp/CMakeLists.txt index 0da6c42..1c53a72 100644 --- a/Firestore/third_party/abseil-cpp/CMakeLists.txt +++ b/Firestore/third_party/abseil-cpp/CMakeLists.txt @@ -55,16 +55,6 @@ find_package(Threads REQUIRED) find_package(GTest REQUIRED) -# commented: used only for standalone test -#add_subdirectory(cctz) -#add_subdirectory(googletest) - -## check targets -#check_target(cctz) -#check_target(gtest) -#check_target(gtest_main) -#check_target(gmock) - # -fexceptions set(ABSL_EXCEPTIONS_FLAG "${CMAKE_CXX_EXCEPTIONS}") @@ -74,7 +64,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FIX_MSVC} ${CMAKE_CXX_FLAGS}") list(APPEND ABSL_TEST_COMMON_LIBRARIES GTest::Main GTest::GTest - #GMock::GMock ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/Firestore/third_party/abseil-cpp/absl/CMakeLists.txt b/Firestore/third_party/abseil-cpp/absl/CMakeLists.txt index c909ba0..fb158fa 100644 --- a/Firestore/third_party/abseil-cpp/absl/CMakeLists.txt +++ b/Firestore/third_party/abseil-cpp/absl/CMakeLists.txt @@ -17,14 +17,5 @@ add_subdirectory(base) -#add_subdirectory(algorithm) -#add_subdirectory(container) -#add_subdirectory(debugging) -#add_subdirectory(memory) add_subdirectory(meta) -#add_subdirectory(numeric) add_subdirectory(strings) -#add_subdirectory(synchronization) -#add_subdirectory(time) -#add_subdirectory(types) -#add_subdirectory(utility) diff --git a/Firestore/third_party/abseil-cpp/absl/base/CMakeLists.txt b/Firestore/third_party/abseil-cpp/absl/base/CMakeLists.txt index 1adc249..842bb47 100644 --- a/Firestore/third_party/abseil-cpp/absl/base/CMakeLists.txt +++ b/Firestore/third_party/abseil-cpp/absl/base/CMakeLists.txt @@ -16,57 +16,26 @@ list(APPEND BASE_PUBLIC_HEADERS "attributes.h" -# "call_once.h" -# "casts.h" "config.h" "dynamic_annotations.h" "macros.h" "optimization.h" "policy_checks.h" "port.h" -# "thread_annotations.h" ) list(APPEND BASE_INTERNAL_HEADERS "internal/atomic_hook.h" -# "internal/cycleclock.h" -# "internal/endian.h" -# "internal/exception_testing.h" -# "internal/identity.h" -# "internal/invoke.h" "internal/log_severity.h" -# "internal/low_level_alloc.h" -# "internal/low_level_scheduling.h" -# "internal/malloc_extension_c.h" -# "internal/malloc_extension.h" -# "internal/malloc_hook_c.h" -# "internal/malloc_hook.h" -# "internal/malloc_hook_invoke.h" -# "internal/per_thread_tls.h" "internal/raw_logging.h" -# "internal/scheduling_mode.h" -# "internal/spinlock.h" -# "internal/spinlock_wait.h" -# "internal/sysinfo.h" -# "internal/thread_identity.h" "internal/throw_delegate.h" -# "internal/tsan_mutex_interface.h" -# "internal/unaligned_access.h" -# "internal/unscaledcycleclock.h" ) # absl_base main library list(APPEND BASE_SRC -# "internal/cycleclock.cc" "internal/raw_logging.cc" -# "internal/spinlock.cc" -# "internal/sysinfo.cc" -# "internal/thread_identity.cc" -# "internal/unscaledcycleclock.cc" -# "internal/low_level_alloc.cc" -# "internal/malloc_hook.cc" ${BASE_PUBLIC_HEADERS} ${BASE_INTERNAL_HEADERS} ) @@ -78,25 +47,10 @@ absl_library( ${BASE_SRC} PUBLIC_LIBRARIES absl_dynamic_annotations -# absl_spinlock_wait EXPORT_NAME base ) -## malloc extension library -#set(MALLOC_EXTENSION_SRC "internal/malloc_extension.cc") -#set(MALLOC_EXTENSION_PUBLIC_LIBRARIES absl::base) -# -#absl_library( -# TARGET -# absl_malloc_extension -# SOURCES -# ${MALLOC_EXTENSION_SRC} -# PUBLIC_LIBRARIES -# ${MALLOC_EXTENSION_PUBLIC_LIBRARIES} -# EXPORT_NAME -# malloc_extension -#) # throw delegate library set(THROW_DELEGATE_SRC "internal/throw_delegate.cc") @@ -126,130 +80,9 @@ absl_library( ) -## spinlock_wait library -#set(SPINLOCK_WAIT_SRC "internal/spinlock_wait.cc") -# -#absl_library( -# TARGET -# absl_spinlock_wait -# SOURCES -# ${SPINLOCK_WAIT_SRC} -#) -# -# -## malloc_internal library -#list(APPEND MALLOC_INTERNAL_SRC -# "internal/low_level_alloc.cc" -# "internal/malloc_hook.cc" -# "internal/malloc_hook_mmap_linux.inc" -#) -# -#absl_library( -# TARGET -# absl_malloc_internal -# SOURCES -# ${MALLOC_INTERNAL_SRC} -# PUBLIC_LIBRARIES -# absl_dynamic_annotations -#) -# -# -# -## -### TESTS -## -# -## call once test -#set(CALL_ONCE_TEST_SRC "call_once_test.cc") -#set(CALL_ONCE_TEST_PUBLIC_LIBRARIES absl::base absl::synchronization) -# -#absl_test( -# TARGET -# call_once_test -# SOURCES -# ${CALL_ONCE_TEST_SRC} -# PUBLIC_LIBRARIES -# ${CALL_ONCE_TEST_PUBLIC_LIBRARIES} -#) -# -# -## test bit_cast_test -#set(BIT_CAST_TEST_SRC "bit_cast_test.cc") -# -#absl_test( -# TARGET -# bit_cast_test -# SOURCES -# ${BIT_CAST_TEST_SRC} -#) -# -# -## test absl_throw_delegate_test -#set(THROW_DELEGATE_TEST_SRC "throw_delegate_test.cc") -#set(THROW_DELEGATE_TEST_PUBLIC_LIBRARIES absl::base absl_throw_delegate) -# -#absl_test( -# TARGET -# throw_delegate_test -# SOURCES -# ${THROW_DELEGATE_TEST_SRC} -# PUBLIC_LIBRARIES -# ${THROW_DELEGATE_TEST_PUBLIC_LIBRARIES} -#) -# -# -## test invoke_test -#set(INVOKE_TEST_SRC "invoke_test.cc") -#set(INVOKE_TEST_PUBLIC_LIBRARIES absl::strings) -# -#absl_test( -# TARGET -# invoke_test -# SOURCES -# ${INVOKE_TEST_SRC} -# PUBLIC_LIBRARIES -# ${INVOKE_TEST_PUBLIC_LIBRARIES} -#) -# # -## test spinlock_test_common -#set(SPINLOCK_TEST_COMMON_SRC "spinlock_test_common.cc") -#set(SPINLOCK_TEST_COMMON_PUBLIC_LIBRARIES absl::base absl::synchronization) +## TESTS # -#absl_test( -# TARGET -# spinlock_test_common -# SOURCES -# ${SPINLOCK_TEST_COMMON_SRC} -# PUBLIC_LIBRARIES -# ${SPINLOCK_TEST_COMMON_PUBLIC_LIBRARIES} -#) -# -# -## test spinlock_test -#set(SPINLOCK_TEST_SRC "spinlock_test_common.cc") -#set(SPINLOCK_TEST_PUBLIC_LIBRARIES absl::base absl::synchronization) -# -#absl_test( -# TARGET -# spinlock_test -# SOURCES -# ${SPINLOCK_TEST_SRC} -# PUBLIC_LIBRARIES -# ${SPINLOCK_TEST_PUBLIC_LIBRARIES} -#) -# -# -## test endian_test -#set(ENDIAN_TEST_SRC "internal/endian_test.cc") -# -#absl_test( -# TARGET -# endian_test -# SOURCES -# ${ENDIAN_TEST_SRC} -#) - # test config_test set(CONFIG_TEST_SRC "config_test.cc") @@ -276,62 +109,3 @@ absl_test( PUBLIC_LIBRARIES ${RAW_LOGGING_TEST_PUBLIC_LIBRARIES} ) - - -## test sysinfo_test -#set(SYSINFO_TEST_SRC "internal/sysinfo_test.cc") -#set(SYSINFO_TEST_PUBLIC_LIBRARIES absl::base absl::synchronization) -# -#absl_test( -# TARGET -# sysinfo_test -# SOURCES -# ${SYSINFO_TEST_SRC} -# PUBLIC_LIBRARIES -# ${SYSINFO_TEST_PUBLIC_LIBRARIES} -#) -# -# -## test low_level_alloc_test -#set(LOW_LEVEL_ALLOC_TEST_SRC "internal/low_level_alloc_test.cc") -#set(LOW_LEVEL_ALLOC_TEST_PUBLIC_LIBRARIES absl::base) -# -#absl_test( -# TARGET -# low_level_alloc_test -# SOURCES -# ${LOW_LEVEL_ALLOC_TEST_SRC} -# PUBLIC_LIBRARIES -# ${LOW_LEVEL_ALLOC_TEST_PUBLIC_LIBRARIES} -#) -# -# -## test thread_identity_test -#set(THREAD_IDENTITY_TEST_SRC "internal/thread_identity_test.cc") -#set(THREAD_IDENTITY_TEST_PUBLIC_LIBRARIES absl::base absl::synchronization) -# -#absl_test( -# TARGET -# thread_identity_test -# SOURCES -# ${THREAD_IDENTITY_TEST_SRC} -# PUBLIC_LIBRARIES -# ${THREAD_IDENTITY_TEST_PUBLIC_LIBRARIES} -#) -# -# -## test absl_malloc_extension_system_malloc_test -#set(MALLOC_EXTENSION_SYSTEM_MALLOC_TEST_SRC "internal/malloc_extension_test.cc") -#set(MALLOC_EXTENSION_SYSTEM_MALLOC_TEST_PUBLIC_LIBRARIES absl::base absl_malloc_extension) -#set(MALLOC_EXTENSION_SYSTEM_MALLOC_TEST_PRIVATE_COMPILE_FLAGS "-DABSL_MALLOC_EXTENSION_TEST_ALLOW_MISSING_EXTENSION=1") -# -#absl_test( -# TARGET -# absl_malloc_extension_system_malloc_test -# SOURCES -# ${MALLOC_EXTENSION_SYSTEM_MALLOC_TEST_SRC} -# PUBLIC_LIBRARIES -# ${MALLOC_EXTENSION_SYSTEM_MALLOC_TEST_PUBLIC_LIBRARIES} -# PRIVATE_COMPILE_FLAGS -# ${MALLOC_EXTENSION_SYSTEM_MALLOC_TEST_PRIVATE_COMPILE_FLAGS} -#) diff --git a/Firestore/third_party/abseil-cpp/absl/base/config_test.cc b/Firestore/third_party/abseil-cpp/absl/base/config_test.cc index 83d45b7..4e6dd6a 100644 --- a/Firestore/third_party/abseil-cpp/absl/base/config_test.cc +++ b/Firestore/third_party/abseil-cpp/absl/base/config_test.cc @@ -17,7 +17,6 @@ #include #include "gtest/gtest.h" -// #include "absl/synchronization/internal/thread_pool.h" namespace { @@ -41,22 +40,4 @@ TEST(ConfigTest, Endianness) { #endif } -#if 0 -#if defined(ABSL_HAVE_THREAD_LOCAL) -TEST(ConfigTest, ThreadLocal) { - static thread_local int mine_mine_mine = 16; - EXPECT_EQ(16, mine_mine_mine); - { - absl::synchronization_internal::ThreadPool pool(1); - pool.Schedule([&] { - EXPECT_EQ(16, mine_mine_mine); - mine_mine_mine = 32; - EXPECT_EQ(32, mine_mine_mine); - }); - } - EXPECT_EQ(16, mine_mine_mine); -} -#endif -#endif // 0 - } // namespace diff --git a/Firestore/third_party/abseil-cpp/absl/strings/CMakeLists.txt b/Firestore/third_party/abseil-cpp/absl/strings/CMakeLists.txt index 2babc9f..070bf4f 100644 --- a/Firestore/third_party/abseil-cpp/absl/strings/CMakeLists.txt +++ b/Firestore/third_party/abseil-cpp/absl/strings/CMakeLists.txt @@ -17,27 +17,14 @@ list(APPEND STRINGS_PUBLIC_HEADERS "ascii.h" -# "escaping.h" "match.h" -# "numbers.h" -# "str_cat.h" "string_view.h" -# "strip.h" -# "str_join.h" -# "str_replace.h" -# "str_split.h" -# "substitute.h" ) list(APPEND STRINGS_INTERNAL_HEADERS -# "internal/char_map.h" "internal/memutil.h" -# "internal/ostringstream.h" "internal/resize_uninitialized.h" -# "internal/str_join_internal.h" -# "internal/str_split_internal.h" -# "internal/utf8.h" ) @@ -45,16 +32,9 @@ list(APPEND STRINGS_INTERNAL_HEADERS # add string library list(APPEND STRINGS_SRC "ascii.cc" -# "escaping.cc" "internal/memutil.cc" -# "internal/utf8.cc" "match.cc" -# "numbers.cc" -# "str_cat.cc" -# "str_replace.cc" -# "str_split.cc" "string_view.cc" -# "substitute.cc" ${STRINGS_PUBLIC_HEADERS} ${STRINGS_INTERNAL_HEADERS} ) @@ -90,20 +70,6 @@ absl_test( ) -## test escaping_test -#set(ESCAPING_TEST_SRC "escaping_test.cc") -#set(ESCAPING_TEST_PUBLIC_LIBRARIES absl::strings absl::base) -# -#absl_test( -# TARGET -# escaping_test -# SOURCES -# ${ESCAPING_TEST_SRC} -# PUBLIC_LIBRARIES -# ${ESCAPING_TEST_PUBLIC_LIBRARIES} -#) - - # test ascii_test set(ASCII_TEST_SRC "ascii_test.cc") set(ASCII_TEST_PUBLIC_LIBRARIES absl::strings) @@ -132,20 +98,6 @@ absl_test( ) -## test utf8_test -#set(UTF8_TEST_SRC "internal/utf8_test.cc") -#set(UTF8_TEST_PUBLIC_LIBRARIES absl::strings absl::base) -# -#absl_test( -# TARGET -# utf8_test -# SOURCES -# ${UTF8_TEST_SRC} -# PUBLIC_LIBRARIES -# ${UTF8_TEST_PUBLIC_LIBRARIES} -#) -# -# # test string_view_test set(STRING_VIEW_TEST_SRC "string_view_test.cc") set(STRING_VIEW_TEST_PUBLIC_LIBRARIES absl::strings absl_throw_delegate absl::base) @@ -160,59 +112,6 @@ absl_test( ) -## test substitute_test -#set(SUBSTITUTE_TEST_SRC "substitute_test.cc") -#set(SUBSTITUTE_TEST_PUBLIC_LIBRARIES absl::strings absl::base) -# -#absl_test( -# TARGET -# substitute_test -# SOURCES -# ${SUBSTITUTE_TEST_SRC} -# PUBLIC_LIBRARIES -# ${SUBSTITUTE_TEST_PUBLIC_LIBRARIES} -#) -# -# -## test str_replace_test -#set(STR_REPLACE_TEST_SRC "str_replace_test.cc") -#set(STR_REPLACE_TEST_PUBLIC_LIBRARIES absl::strings absl::base absl_throw_delegate) -# -#absl_test( -# TARGET -# str_replace_test -# SOURCES -# ${STR_REPLACE_TEST_SRC} -# PUBLIC_LIBRARIES -# ${STR_REPLACE_TEST_PUBLIC_LIBRARIES} -#) -# -# -## test str_split_test -#set(STR_SPLIT_TEST_SRC "str_split_test.cc") -#set(STR_SPLIT_TEST_PUBLIC_LIBRARIES absl::strings absl::base absl_throw_delegate) -# -#absl_test( -# TARGET -# str_split_test -# SOURCES -# ${STR_SPLIT_TEST_SRC} -# PUBLIC_LIBRARIES -# ${STR_SPLIT_TEST_PUBLIC_LIBRARIES} -#) -# -# -## test ostringstream_test -#set(OSTRINGSTREAM_TEST_SRC "internal/ostringstream_test.cc") -# -#absl_test( -# TARGET -# ostringstream_test -# SOURCES -# ${OSTRINGSTREAM_TEST_SRC} -#) - - # test resize_uninitialized_test set(RESIZE_UNINITIALIZED_TEST_SRC "internal/resize_uninitialized_test.cc") @@ -222,73 +121,3 @@ absl_test( SOURCES ${RESIZE_UNINITIALIZED_TEST_SRC} ) - - -## test str_join_test -#set(STR_JOIN_TEST_SRC "str_join_test.cc") -#set(STR_JOIN_TEST_PUBLIC_LIBRARIES absl::strings) -# -#absl_test( -# TARGET -# str_join_test -# SOURCES -# ${STR_JOIN_TEST_SRC} -# PUBLIC_LIBRARIES -# ${STR_JOIN_TEST_PUBLIC_LIBRARIES} -#) -# -# -## test str_cat_test -#set(STR_CAT_TEST_SRC "str_cat_test.cc") -#set(STR_CAT_TEST_PUBLIC_LIBRARIES absl::strings) -# -#absl_test( -# TARGET -# str_cat_test -# SOURCES -# ${STR_CAT_TEST_SRC} -# PUBLIC_LIBRARIES -# ${STR_CAT_TEST_PUBLIC_LIBRARIES} -#) -# -# -## test numbers_test -#set(NUMBERS_TEST_SRC "numbers_test.cc") -#set(NUMBERS_TEST_PUBLIC_LIBRARIES absl::strings) -# -#absl_test( -# TARGET -# numbers_test -# SOURCES -# ${NUMBERS_TEST_SRC} -# PUBLIC_LIBRARIES -# ${NUMBERS_TEST_PUBLIC_LIBRARIES} -#) -# -# -## test strip_test -#set(STRIP_TEST_SRC "strip_test.cc") -#set(STRIP_TEST_PUBLIC_LIBRARIES absl::strings) -# -#absl_test( -# TARGET -# strip_test -# SOURCES -# ${STRIP_TEST_SRC} -# PUBLIC_LIBRARIES -# ${STRIP_TEST_PUBLIC_LIBRARIES} -#) -# -# -## test char_map_test -#set(CHAR_MAP_TEST_SRC "internal/char_map_test.cc") -#set(CHAR_MAP_TEST_PUBLIC_LIBRARIES absl::strings) -# -#absl_test( -# TARGET -# char_map_test -# SOURCES -# ${CHAR_MAP_TEST_SRC} -# PUBLIC_LIBRARIES -# ${CHAR_MAP_TEST_PUBLIC_LIBRARIES} -#) -- cgit v1.2.3 From 56c8c06594787ab778915447f552769dcb4e915a Mon Sep 17 00:00:00 2001 From: Marek Gilbert Date: Fri, 8 Dec 2017 09:43:13 -0800 Subject: Fix whitespace --- Firestore/third_party/abseil-cpp/absl/base/CMakeLists.txt | 2 +- Firestore/third_party/abseil-cpp/absl/meta/CMakeLists.txt | 3 --- cmake/external/abseil-cpp.cmake | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) (limited to 'Firestore/third_party') diff --git a/Firestore/third_party/abseil-cpp/absl/base/CMakeLists.txt b/Firestore/third_party/abseil-cpp/absl/base/CMakeLists.txt index 842bb47..a6cd1ff 100644 --- a/Firestore/third_party/abseil-cpp/absl/base/CMakeLists.txt +++ b/Firestore/third_party/abseil-cpp/absl/base/CMakeLists.txt @@ -34,7 +34,7 @@ list(APPEND BASE_INTERNAL_HEADERS # absl_base main library -list(APPEND BASE_SRC +list(APPEND BASE_SRC "internal/raw_logging.cc" ${BASE_PUBLIC_HEADERS} ${BASE_INTERNAL_HEADERS} diff --git a/Firestore/third_party/abseil-cpp/absl/meta/CMakeLists.txt b/Firestore/third_party/abseil-cpp/absl/meta/CMakeLists.txt index d56fced..a25dd61 100644 --- a/Firestore/third_party/abseil-cpp/absl/meta/CMakeLists.txt +++ b/Firestore/third_party/abseil-cpp/absl/meta/CMakeLists.txt @@ -44,6 +44,3 @@ absl_test( PUBLIC_LIBRARIES ${TYPE_TRAITS_TEST_PUBLIC_LIBRARIES} absl::meta ) - - - diff --git a/cmake/external/abseil-cpp.cmake b/cmake/external/abseil-cpp.cmake index e3deec3..d29b7d5 100644 --- a/cmake/external/abseil-cpp.cmake +++ b/cmake/external/abseil-cpp.cmake @@ -33,4 +33,3 @@ ExternalProject_Add( -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH= ) - -- cgit v1.2.3