From 8ed3ba8af499eefca364b737dcb24c2ee91c5cb0 Mon Sep 17 00:00:00 2001 From: David Sisson Date: Thu, 25 Jul 2024 17:53:39 -0700 Subject: [PATCH] removed abseil-cpp submodule --- .gitmodules | 3 --- .licenserc.yaml | 1 - CMakeLists.txt | 17 ++--------------- third_party/CMakeLists.txt | 4 ---- third_party/abseil-cpp | 1 - 5 files changed, 2 insertions(+), 24 deletions(-) delete mode 160000 third_party/abseil-cpp diff --git a/.gitmodules b/.gitmodules index 6a09c571..3fb78da1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,9 +7,6 @@ [submodule "third_party/fmt"] path = third_party/fmt url = https://github.com/fmtlib/fmt -[submodule "third_party/abseil-cpp"] - path = third_party/abseil-cpp - url = https://github.com/abseil/abseil-cpp.git [submodule "third_party/datetime"] path = third_party/datetime url = https://github.com/HowardHinnant/date.git diff --git a/.licenserc.yaml b/.licenserc.yaml index ceea7649..f2e85bba 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -12,7 +12,6 @@ header: - '.clang-tidy' - '.cmake-format' - '.licenserc.yaml' - - 'third_party/abseil-cpp' - 'third_party/antlr4' - 'third_party/datetime' - 'third_party/fmt' diff --git a/CMakeLists.txt b/CMakeLists.txt index 07655acc..9ad3e15c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,25 +33,12 @@ option( include_directories(include) include_directories(src) -# TODO: Simplify once we can require cmake 3.27 (where CONFIG is default). - -# Due to packaging changes we use the combined protobuf/absl packaging if -# available otherwise we fallback to the older protobuf method. find_package(Protobuf QUIET CONFIG) if(${Protobuf_FOUND}) message(STATUS "Modern protobuf library located.") - set(ABSL_INCLUDED_WITH_PROTOBUF ON) else() - find_package(Protobuf QUIET) - if(${Protobuf_FOUND}) - message(STATUS "Legacy protobuf library located.") - include_directories(${Protobuf_INCLUDE_DIRS}) - set(ABSL_INCLUDED_WITH_PROTOBUF OFF) - else() - message(STATUS "Fetching external protobuf library.") - include(third_party/protobuf.cmake) - set(ABSL_INCLUDED_WITH_PROTOBUF ON) - endif() + message(STATUS "Fetching external protobuf library.") + include(third_party/protobuf.cmake) endif() add_subdirectory(third_party) diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index 0a5f605b..19bb06d5 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -4,10 +4,6 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) set(ABSL_ENABLE_INSTALL ON) -if(NOT ${ABSL_INCLUDED_WITH_PROTOBUF}) - set(ABSL_PROPAGATE_CXX_STD ON) - add_subdirectory(abseil-cpp) -endif() include(datetime.cmake) diff --git a/third_party/abseil-cpp b/third_party/abseil-cpp deleted file mode 160000 index c2435f83..00000000 --- a/third_party/abseil-cpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c2435f8342c2d0ed8101cb43adfd605fdc52dca2