diff options
| author | past-due <30942300+past-due@users.noreply.github.com> | 2019-09-27 00:31:33 -0400 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-09-26 21:31:33 -0700 |
| commit | 67a9305c75f89c6a7e229c94d1800b598f0666b3 (patch) | |
| tree | e702e453a71551bc78ce47d29ac6ffd90fc9bc35 /ports/curlpp | |
| parent | ee0bfad1cfa11e048823e2d02d9f619db7d94a3f (diff) | |
| download | vcpkg-67a9305c75f89c6a7e229c94d1800b598f0666b3.tar.gz vcpkg-67a9305c75f89c6a7e229c94d1800b598f0666b3.zip | |
[curl] Update to 7.66.0 (#7331)
* [curl] Update to 7.65.3
* [curl] Remove USAGE
(Use auto-generated message about exported config.)
* Add wrapper
* [curl] Update to 7.66.0
* Add wrapper to curl
* drop parent_scope
* add change that didn't make it
* Populate CURL_LIBRARY
* Fix transitive dependency
* try to actually set LIBRARIES
* get .libs
* fix curlpp and dynamic builds on linux
* add @cenit's suggestion and fix typo in curlpp
* modify PDAL patch
Diffstat (limited to 'ports/curlpp')
| -rw-r--r-- | ports/curlpp/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/curlpp/vcpkg-cmake-wrapper.cmake | 35 |
2 files changed, 0 insertions, 41 deletions
diff --git a/ports/curlpp/portfile.cmake b/ports/curlpp/portfile.cmake index aaa9c51ab..e08a2868e 100644 --- a/ports/curlpp/portfile.cmake +++ b/ports/curlpp/portfile.cmake @@ -29,12 +29,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin ) - - configure_file( - ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake - ${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT} - @ONLY - ) endif() # Handle copyright diff --git a/ports/curlpp/vcpkg-cmake-wrapper.cmake b/ports/curlpp/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 0bffdc6b4..000000000 --- a/ports/curlpp/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,35 +0,0 @@ -_find_package(${ARGS})
-
-if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
- if(TARGET unofficial::curlpp::curlpp)
- # Fix CURL dependencies. See:
- # https://github.com/Microsoft/vcpkg/issues/4312
-
- set(_libs "")
-
- find_package(CURL REQUIRED)
-
- set(ZLIB_ROOT ${CMAKE_PREFIX_PATH}) # Prefer Zlib installed via `vcpkg`
- find_package(ZLIB)
- unset(ZLIB_ROOT)
-
- list(APPEND _libs ${CURL_LIBRARIES} ZLIB::ZLIB)
-
- find_package(OpenSSL QUIET)
- if(OPENSSL_FOUND)
- list(APPEND _libs OpenSSL::SSL OpenSSL::Crypto)
- endif()
-
- find_package(Threads REQUIRED)
- list(APPEND _libs Threads::Threads)
-
- if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
- list(APPEND _libs Ws2_32 Crypt32)
- endif()
-
- set_target_properties(
- unofficial::curlpp::curlpp
- PROPERTIES INTERFACE_LINK_LIBRARIES "${_libs}"
- )
- endif()
-endif()
|