[curl] Update to 8.18.0 #48563
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| diff --git a/cmake/libssh2-config.cmake.in b/cmake/libssh2-config.cmake.in | ||
| index edc86d7..fd53d55 100644 | ||
| --- a/cmake/libssh2-config.cmake.in | ||
| +++ b/cmake/libssh2-config.cmake.in | ||
| @@ -22,10 +22,22 @@ include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake") | ||
|
|
||
| # Alias for either shared or static library | ||
| if(NOT TARGET @PROJECT_NAME@::@LIB_NAME@) | ||
| + if(CMAKE_VERSION VERSION_LESS "3.18.0") | ||
| + # cannot add alias to non-global imported library | ||
| + add_library(@PROJECT_NAME@::@LIB_NAME@ INTERFACE IMPORTED) | ||
| + set_target_properties(@PROJECT_NAME@::@LIB_NAME@ PROPERTIES INTERFACE_LINK_LIBRARIES @PROJECT_NAME@::@LIB_SELECTED@) | ||
| + else() | ||
| add_library(@PROJECT_NAME@::@LIB_NAME@ ALIAS @PROJECT_NAME@::@LIB_SELECTED@) | ||
| + endif() | ||
| endif() | ||
|
|
||
| # Compatibility alias | ||
| if(NOT TARGET Libssh2::@LIB_NAME@) | ||
| + if(CMAKE_VERSION VERSION_LESS "3.18.0") | ||
| + # cannot add alias to non-global imported library | ||
| + add_library(Libssh2::@LIB_NAME@ INTERFACE IMPORTED) | ||
| + set_target_properties(Libssh2::@LIB_NAME@ PROPERTIES INTERFACE_LINK_LIBRARIES @PROJECT_NAME@::@LIB_SELECTED@) | ||
| + else() | ||
| add_library(Libssh2::@LIB_NAME@ ALIAS @PROJECT_NAME@::@LIB_SELECTED@) | ||
| + endif() | ||
| endif() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| diff --git a/crypto/ossl/CMakeLists.txt b/crypto/ossl/CMakeLists.txt | ||
| index da2ef2df..1a108ada 100644 | ||
| --- a/crypto/ossl/CMakeLists.txt | ||
| +++ b/crypto/ossl/CMakeLists.txt | ||
| @@ -29,14 +29,11 @@ set(ngtcp2_crypto_ossl_SOURCES | ||
| ) | ||
|
|
||
| set(ngtcp2_crypto_ossl_INCLUDE_DIRS | ||
| - "${CMAKE_CURRENT_SOURCE_DIR}/../../lib/includes" | ||
| - "${CMAKE_CURRENT_BINARY_DIR}/../../lib/includes" | ||
| - "${CMAKE_CURRENT_SOURCE_DIR}/../../lib" | ||
| - "${CMAKE_CURRENT_SOURCE_DIR}/../../crypto/includes" | ||
| - "${CMAKE_CURRENT_BINARY_DIR}/../../crypto/includes" | ||
| - "${CMAKE_CURRENT_SOURCE_DIR}/../../crypto" | ||
| - "${CMAKE_CURRENT_BINARY_DIR}/../../crypto" | ||
| - "${OPENSSL_INCLUDE_DIRS}" | ||
| + "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/lib>" | ||
| + "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/crypto/includes>" | ||
| + "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/crypto/includes>" | ||
| + "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/crypto>" | ||
| + "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/crypto>" | ||
| ) | ||
|
|
||
| foreach(name libngtcp2_crypto_ossl.pc) | ||
| @@ -55,9 +52,10 @@ if(ENABLE_SHARED_LIB) | ||
| ) | ||
| target_include_directories(ngtcp2_crypto_ossl PUBLIC | ||
| ${ngtcp2_crypto_ossl_INCLUDE_DIRS}) | ||
| - target_link_libraries(ngtcp2_crypto_ossl ngtcp2 ${OPENSSL_LIBRARIES}) | ||
| + target_link_libraries(ngtcp2_crypto_ossl PUBLIC ngtcp2 OpenSSL::SSL) | ||
|
|
||
| install(TARGETS ngtcp2_crypto_ossl | ||
| + EXPORT "${PROJECT_NAME}Targets" | ||
| ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" | ||
| LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" | ||
| RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") | ||
| @@ -77,8 +75,10 @@ if(ENABLE_STATIC_LIB) | ||
| "-DNGTCP2_STATICLIB") | ||
| target_include_directories(ngtcp2_crypto_ossl_static PUBLIC | ||
| ${ngtcp2_crypto_ossl_INCLUDE_DIRS}) | ||
| + target_link_libraries(ngtcp2_crypto_ossl_static PUBLIC ngtcp2_static OpenSSL::SSL) | ||
|
|
||
| install(TARGETS ngtcp2_crypto_ossl_static | ||
| + EXPORT "${PROJECT_NAME}Targets" | ||
| DESTINATION "${CMAKE_INSTALL_LIBDIR}") | ||
| endif() | ||
|
|
||
| diff --git a/lib/config.cmake.in b/lib/config.cmake.in | ||
| index 435a4d4a..fffcd517 100644 | ||
| --- a/lib/config.cmake.in | ||
| +++ b/lib/config.cmake.in | ||
| @@ -1,3 +1,6 @@ | ||
| include(CMakeFindDependencyMacro) | ||
| +if("@HAVE_OSSL@") | ||
| + find_dependency(OpenSSL) | ||
| +endif() | ||
|
|
||
| include("${CMAKE_CURRENT_LIST_DIR}/@NGTCP2_TARGETS_EXPORT_NAME@.cmake") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this maybe include the port version like
vcpkg-2?Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(I don't want to read the manifest for an optional property.)
SOURCE_PATH(e.g.c-8_18_0-1-f780f9182e.clean->f780f9182e). It is unique for a combination of sources and patches.