Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 10:47:59 +08:00
Code Issues Projects Releases Wiki Activity

Merge topic 'curl-8.15-deprecated-sectransp'

Browse Source 
00c34a7d25 cmCurl: Suppress curl 8.15 deprecation warning for curl 8.[3-5] workaround

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10971
This commit is contained in:
Brad King
2025-07-28 13:25:37 +00:00
committed by Kitware Robot
parent 6b6e276c30 00c34a7d25
commit f825f2be93
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmCurl.cxx
View File

@@ -65,7 +65,23 @@ static_assert(CURL_SSLVERSION_LAST == 8,
// curl 8.3.0 through 8.5.x did not re-initialize LibreSSL correctly, // curl 8.3.0 through 8.5.x did not re-initialize LibreSSL correctly,
// so prefer the Secure Transport backend by default in those versions. // so prefer the Secure Transport backend by default in those versions.
if (cv->version_num >= 0x080300 && cv->version_num < 0x080600) { if (cv->version_num >= 0x080300 && cv->version_num < 0x080600) {
# if defined(__clang__)
# define CM_CURL_DEPRECATED_CURLSSLBACKEND_SECURETRANSPORT_CLANG
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wdeprecated-declarations"
# elif defined(__GNUC__)
# define CM_CURL_DEPRECATED_CURLSSLBACKEND_SECURETRANSPORT_GCC
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
# endif
curl_global_sslset(CURLSSLBACKEND_SECURETRANSPORT, NULL, NULL); curl_global_sslset(CURLSSLBACKEND_SECURETRANSPORT, NULL, NULL);
# if defined(CM_CURL_DEPRECATED_CURLSSLBACKEND_SECURETRANSPORT_CLANG)
# undef CM_CURL_DEPRECATED_CURLSSLBACKEND_SECURETRANSPORT_CLANG
# pragma clang diagnostic pop
# elif defined(CM_CURL_DEPRECATED_CURLSSLBACKEND_SECURETRANSPORT_GCC)
# undef CM_CURL_DEPRECATED_CURLSSLBACKEND_SECURETRANSPORT_GCC
# pragma GCC diagnostic pop
# endif
} }
} }
#endif #endif