Merge pull request #8532 from cenit/dev/cenit/curlpp

[curlpp] fix regression introduced in #7331
microsoft · Oct 10, 2019 · d3fb058 · d3fb058
2 parents 8539016 + d9b08b2
commit d3fb058
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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
@@ -0,0 +1,5 @@
+set(FIND_CURLPP_ARGS ${ARGS})
+include(CMakeFindDependencyMacro)
+find_dependency(CURL)
+
+_find_package(${FIND_CURLPP_ARGS})