diff --git a/ports/curlpp/portfile.cmake b/ports/curlpp/portfile.cmake index f589a73bb0d821..f52c2b575f3f4e 100644 --- a/ports/curlpp/portfile.cmake +++ b/ports/curlpp/portfile.cmake @@ -9,28 +9,28 @@ vcpkg_from_github( fix-findzliberror.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT} TARGET_PATH share/unofficial-${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT} PACKAGE_NAME unofficial-${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/bin - ${CURRENT_PACKAGES_DIR}/debug/bin + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" ) +elseif(VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curlpp-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curlpp-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") endif() vcpkg_copy_pdbs() - -file(INSTALL ${SOURCE_PATH}/doc/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}) - - vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/doc/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}") diff --git a/ports/curlpp/vcpkg.json b/ports/curlpp/vcpkg.json index 4486c433db6be4..0fbbe9fe64b77f 100644 --- a/ports/curlpp/vcpkg.json +++ b/ports/curlpp/vcpkg.json @@ -1,9 +1,17 @@ { "name": "curlpp", - "version-string": "2018-06-15", - "port-version": 5, + "version-date": "2018-06-15", + "port-version": 6, "description": "C++ wrapper around libcURL", "dependencies": [ - "curl" + "curl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index e7be1c8a662cbd..443e8ace017664 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1706,7 +1706,7 @@ }, "curlpp": { "baseline": "2018-06-15", - "port-version": 5 + "port-version": 6 }, "cute-headers": { "baseline": "2019-09-20", diff --git a/versions/c-/curlpp.json b/versions/c-/curlpp.json index 5c17f5665f4a5e..33f166cd3ded0e 100644 --- a/versions/c-/curlpp.json +++ b/versions/c-/curlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a4cea77cfb3429b1ea778167d06c39a691b97e13", + "version-date": "2018-06-15", + "port-version": 6 + }, { "git-tree": "c4802498d8b285cc5a3d3bcb574db0fe22267381", "version-string": "2018-06-15",