Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Patch abseil-cpp to ignore deprecated errors in new Xcode. #12498

Merged
merged 6 commits into from
Mar 8, 2024
Merged

Patch abseil-cpp to ignore deprecated errors in new Xcode. #12498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
494ed83
Add patch for absl to ignore deprecated error.
jonsimantov Mar 8, 2024
408c824
Add platform specificity to patch.
jonsimantov Mar 8, 2024
d676b18
Update patch to check for clang rather than Apple.
jonsimantov Mar 8, 2024
5943397
Add comments to the cmake external file about the patch.
jonsimantov Mar 8, 2024
3482d04
Remove extraneous comment.
jonsimantov Mar 8, 2024
346f225
Fix name of repo.
jonsimantov Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cmake/external/abseil-cpp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

include(ExternalProject)

# Note: When updating to 20230802.0 or later, remove the PATCH_COMMAND below.
set(version 20220623.0)

ExternalProject_Add(
Expand All @@ -31,4 +32,6 @@ ExternalProject_Add(
INSTALL_COMMAND ""
TEST_COMMAND ""
HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"

PATCH_COMMAND patch -Np1 -i ${CMAKE_CURRENT_LIST_DIR}/abseil-cpp.patch.txt
)
27 changes: 27 additions & 0 deletions cmake/external/abseil-cpp.patch.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
diff --git a/absl/meta/type_traits.h b/absl/meta/type_traits.h
index d886cb30..c2a2d15e 100644
--- a/absl/meta/type_traits.h
+++ b/absl/meta/type_traits.h
@@ -35,6 +35,12 @@
#ifndef ABSL_META_TYPE_TRAITS_H_
#define ABSL_META_TYPE_TRAITS_H_

+// Added by firebase-ios-sdk/cmake/external/abseil-cpp.patch.txt
+#if __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated"
+#endif // __clang__
+
#include <cstddef>
#include <functional>
#include <type_traits>
@@ -794,4 +800,9 @@ using swap_internal::StdSwapIsUnconstrained;
ABSL_NAMESPACE_END
} // namespace absl

+// Added by firebase-ios-sdk/cmake/external/abseil-cpp.patch.txt
+#if __clang__
+#pragma clang diagnostic pop
+#endif // __clang__
+
#endif // ABSL_META_TYPE_TRAITS_H_
Loading