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

Add version 1.11.2 of libcpr #26679

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add version 1.11.2 of libcpr #26679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions recipes/cpr/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"1.11.2":
url: "https://github.com/libcpr/cpr/archive/refs/tags/1.11.2.tar.gz"
sha256: "3795a3581109a9ba5e48fbb50f9efe3399a3ede22f2ab606b71059a615cd6084"
"1.11.1":
url: "https://github.com/libcpr/cpr/archive/refs/tags/1.11.1.tar.gz"
sha256: "e84b8ef348f41072609f53aab05bdaab24bf5916c62d99651dfbeaf282a8e0a2"
Expand All @@ -21,6 +24,10 @@ sources:
url: "https://github.com/libcpr/cpr/archive/refs/tags/1.7.2.tar.gz"
sha256: "aa38a414fe2ffc49af13a08b6ab34df825fdd2e7a1213d032d835a779e14176f"
patches:
"1.11.2":
- patch_file: "patches/008-1.11.2-remove-warning-flags.patch"
patch_description: "disable warning flags and warning as error"
patch_type: "portability"
"1.11.1":
- patch_file: "patches/008-1.11.0-remove-warning-flags.patch"
patch_description: "disable warning flags and warning as error"
Expand Down
27 changes: 27 additions & 0 deletions recipes/cpr/all/patches/008-1.11.2-remove-warning-flags.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f6e1d0..6e1e8ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -390,14 +390,14 @@ if(CPR_BUILD_TESTS)
restore_variable(DESTINATION CMAKE_CXX_CLANG_TIDY BACKUP CMAKE_CXX_CLANG_TIDY_BKP)
endif()

-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-else()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -Werror")
- if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
- # Disable C++98 compatibility support in clang: https://github.com/libcpr/cpr/issues/927
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-nonportable-system-include-path -Wno-exit-time-destructors -Wno-undef -Wno-global-constructors -Wno-switch-enum -Wno-old-style-cast -Wno-covered-switch-default -Wno-undefined-func-template")
- endif()
-endif()
+#if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+#else()
+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -Werror")
+# if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+# # Disable C++98 compatibility support in clang: https://github.com/libcpr/cpr/issues/927
+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-nonportable-system-include-path -Wno-exit-time-destructors -Wno-undef -Wno-global-constructors -Wno-switch-enum -Wno-old-style-cast -Wno-covered-switch-default -Wno-undefined-func-template")
+# endif()
+#endif()

add_subdirectory(cpr)
add_subdirectory(include)
2 changes: 2 additions & 0 deletions recipes/cpr/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"1.11.2":
folder: all
"1.11.1":
folder: all
"1.11.0":
Expand Down