aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Sinigardi <stesinigardi@hotmail.com>2019-10-09 17:07:36 +0200
committerStefano Sinigardi <stesinigardi@hotmail.com>2019-10-09 17:07:36 +0200
commitd9b08b2243a9e1d8118d76f2d5b1dd17a92d1db4 (patch)
tree7a5e1207a3756988e34e7750215601459d682dac
parent0de501a3f460f0f27c266b6e77ca22a6e3e597c8 (diff)
downloadvcpkg-d9b08b2243a9e1d8118d76f2d5b1dd17a92d1db4.tar.gz
vcpkg-d9b08b2243a9e1d8118d76f2d5b1dd17a92d1db4.zip
[curlpp] fix regression introduced in #7331, commit 7358190c3be474dd3c9640a98050bdc653c841b3
-rw-r--r--ports/curlpp/CONTROL2
-rw-r--r--ports/curlpp/fix-cmake.patch2
-rw-r--r--ports/curlpp/vcpkg-cmake-wrapper.cmake5
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})