diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-10-09 21:32:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-09 21:32:04 -0700 |
| commit | d3fb0580e058b28dd38a08740f41cc8070305cb9 (patch) | |
| tree | 536aef3bd5fc3fa6aeb090fadad234ebb4c8b364 | |
| parent | 85390163e63d9a87c5e00c784f74a180b73d1661 (diff) | |
| parent | d9b08b2243a9e1d8118d76f2d5b1dd17a92d1db4 (diff) | |
| download | vcpkg-d3fb0580e058b28dd38a08740f41cc8070305cb9.tar.gz vcpkg-d3fb0580e058b28dd38a08740f41cc8070305cb9.zip | |
Merge pull request #8532 from cenit/dev/cenit/curlpp
[curlpp] fix regression introduced in #7331
| -rw-r--r-- | ports/curlpp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/curlpp/fix-cmake.patch | 2 | ||||
| -rw-r--r-- | ports/curlpp/vcpkg-cmake-wrapper.cmake | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/ports/curlpp/CONTROL b/ports/curlpp/CONTROL index 1c6c07f32..538d18ed5 100644 --- a/ports/curlpp/CONTROL +++ b/ports/curlpp/CONTROL @@ -1,4 +1,4 @@ Source: curlpp -Version: 2018-06-15 +Version: 2018-06-15-1 Description: C++ wrapper around libcURL Build-Depends: curl diff --git a/ports/curlpp/fix-cmake.patch b/ports/curlpp/fix-cmake.patch index 3930b65c2..a7cd79413 100644 --- a/ports/curlpp/fix-cmake.patch +++ b/ports/curlpp/fix-cmake.patch @@ -29,7 +29,7 @@ index 8b183a0..a801ae8 100644 -SET_TARGET_PROPERTIES(${PROJECT_NAME}_static PROPERTIES PREFIX "lib") -target_link_libraries(${PROJECT_NAME}_static ${CURL_LIBRARIES} ${CONAN_LIBS}) +SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "lib") -+target_link_libraries(${PROJECT_NAME} ${CURL_LIBRARIES} ${CONAN_LIBS}) ++target_link_libraries(${PROJECT_NAME} CURL::libcurl) +endif() + +target_include_directories(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>) diff --git a/ports/curlpp/vcpkg-cmake-wrapper.cmake b/ports/curlpp/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000..a7f88cd72 --- /dev/null +++ b/ports/curlpp/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,5 @@ +set(FIND_CURLPP_ARGS ${ARGS}) +include(CMakeFindDependencyMacro) +find_dependency(CURL) + +_find_package(${FIND_CURLPP_ARGS}) |