-
Notifications
You must be signed in to change notification settings - Fork 6.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* [czmq] Update to 4.2.1 * [czmq] vcpkg x-add-version czmq * [czmq] Quote paths * [czmq] Overwrite version * [czmq] Fix curl winldap linkage when built as static library * [czmq] Overwrite version * [czmq] Fix dependencies * [czmq] Overwrite version * [czmq] Modernize * [czmq] Overwrite version
- Loading branch information
Showing
11 changed files
with
119 additions
and
120 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains 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 |
|---|---|---|
| @@ -1,51 +1,11 @@ | ||
| find_path( | ||
| LIBCURL_INCLUDE_DIRS | ||
| NAMES curl/curl.h | ||
| ) | ||
|
|
||
| find_library( | ||
| LIBCURL_LIBRARY_DEBUG | ||
| NAMES libcurl-d_imp libcurl-d curl-d curl | ||
| ) | ||
|
|
||
| find_library( | ||
| LIBCURL_LIBRARY_RELEASE | ||
| NAMES libcurl_imp libcurl curl | ||
| ) | ||
|
|
||
| include(SelectLibraryConfigurations) | ||
| select_library_configurations(LIBCURL) | ||
|
|
||
| include(FindPackageHandleStandardArgs) | ||
| find_package_handle_standard_args( | ||
| LIBCURL | ||
| REQUIRED_VARS LIBCURL_LIBRARIES LIBCURL_INCLUDE_DIRS | ||
| ) | ||
|
|
||
| # CURL dependencies | ||
| # https://github.com/Microsoft/vcpkg/issues/4312 | ||
| # https://github.com/microsoft/vcpkg/commit/ee325d14276e7bd7961e94e58293b02d6e9e92da | ||
| # https://github.com/microsoft/vcpkg/pull/6698 | ||
| if (LIBCURL_FOUND) | ||
| find_package(OpenSSL QUIET) | ||
| find_package(ZLIB QUIET) | ||
|
|
||
| if (OPENSSL_FOUND) | ||
| list(APPEND LIBCURL_LIBRARIES | ||
| OpenSSL::SSL | ||
| OpenSSL::Crypto | ||
| ) | ||
| endif () | ||
|
|
||
| if (ZLIB_FOUND) | ||
| list(APPEND LIBCURL_LIBRARIES | ||
| ZLIB::ZLIB | ||
| ) | ||
| endif () | ||
|
|
||
| if (WIN32) | ||
| list(APPEND LIBCURL_LIBRARIES | ||
| Crypt32 | ||
| ) | ||
| endif () | ||
| endif () | ||
| find_package(CURL CONFIG QUIET) | ||
|
|
||
| if(CURL_FOUND) | ||
| set(LIBCURL_INCLUDE_DIRS ${CURL_INCLUDE_DIRS}) | ||
| set(LIBCURL_LIBRARIES CURL::libcurl) | ||
| set(LIBCURL_FOUND TRUE) | ||
| message(STATUS "Found libcurl: ${LIBCURL_LIBRARIES}") | ||
| else() | ||
| set(LIBCURL_FOUND FALSE) | ||
| message(STATUS "Could not find libcurl") | ||
| endif() |
This file contains 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 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 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 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 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 |
|---|---|---|
| @@ -1,19 +1,17 @@ | ||
| diff --git a/builds/cmake/Config.cmake.in b/builds/cmake/Config.cmake.in | ||
| index 9c15f36a..e1475cd6 100644 | ||
| index 9c15f36a..5afff016 100644 | ||
| --- a/builds/cmake/Config.cmake.in | ||
| +++ b/builds/cmake/Config.cmake.in | ||
| @@ -1,4 +1,14 @@ | ||
| @@ -1,4 +1,12 @@ | ||
| @PACKAGE_INIT@ | ||
|
|
||
| +include(CMakeFindDependencyMacro) | ||
| + | ||
| +find_dependency(ZeroMQ) | ||
| + | ||
| +if ("@CZMQ_WITH_LIBCURL@" AND "@LIBCURL_FOUND@") | ||
| + find_dependency(OpenSSL) | ||
| + find_dependency(ZLIB) | ||
| + find_dependency(CURL) | ||
| +endif () | ||
| + | ||
| + | ||
| include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") | ||
| check_required_components("@PROJECT_NAME@") |
This file contains 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 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,53 @@ | ||
| { | ||
| "name": "czmq", | ||
| "version-semver": "4.2.1", | ||
| "description": "High-level C binding for ZeroMQ", | ||
| "homepage": "https://github.com/zeromq/czmq", | ||
| "license": "MPL-2.0", | ||
| "dependencies": [ | ||
| { | ||
| "name": "vcpkg-cmake", | ||
| "host": true | ||
| }, | ||
| { | ||
| "name": "vcpkg-cmake-config", | ||
| "host": true | ||
| }, | ||
| "zeromq" | ||
| ], | ||
| "features": { | ||
| "curl": { | ||
| "description": "Build with libcurl", | ||
| "dependencies": [ | ||
| "curl" | ||
| ] | ||
| }, | ||
| "draft": { | ||
| "description": "Build and install draft APIs" | ||
| }, | ||
| "httpd": { | ||
| "description": "Build with HTTP server support (libmicrohttpd)", | ||
| "dependencies": [ | ||
| "libmicrohttpd" | ||
| ] | ||
| }, | ||
| "lz4": { | ||
| "description": "Build with lz4", | ||
| "dependencies": [ | ||
| "lz4" | ||
| ] | ||
| }, | ||
| "tool": { | ||
| "description": "Build and install czmq tools (zmakecert)" | ||
| }, | ||
| "uuid": { | ||
| "description": "Build with libuuid", | ||
| "dependencies": [ | ||
| { | ||
| "name": "libuuid", | ||
| "platform": "!windows & !uwp & !osx" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } |
This file contains 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 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