diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-11-22 20:54:36 +0100 |
|---|---|---|
| committer | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-11-22 11:54:36 -0800 |
| commit | e3488c9cf8d3aa560fb54f2835b83ee21a693d11 (patch) | |
| tree | 3656680d6908972c85b5a800cec62275a732eea6 | |
| parent | e595f0e59ef90bfbc6a12574a6fd1542514a130e (diff) | |
| download | vcpkg-e3488c9cf8d3aa560fb54f2835b83ee21a693d11.tar.gz vcpkg-e3488c9cf8d3aa560fb54f2835b83ee21a693d11.zip | |
[curlpp] restore installing vcpkg-cmake-wrapper scriptù (#9065)
| -rw-r--r-- | ports/curlpp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/curlpp/portfile.cmake | 17 |
2 files changed, 6 insertions, 13 deletions
diff --git a/ports/curlpp/CONTROL b/ports/curlpp/CONTROL index 538d18ed5..3978c383c 100644 --- a/ports/curlpp/CONTROL +++ b/ports/curlpp/CONTROL @@ -1,4 +1,4 @@ Source: curlpp -Version: 2018-06-15-1 +Version: 2018-06-15-2 Description: C++ wrapper around libcURL Build-Depends: curl diff --git a/ports/curlpp/portfile.cmake b/ports/curlpp/portfile.cmake index e08a2868e..fdc6d7f45 100644 --- a/ports/curlpp/portfile.cmake +++ b/ports/curlpp/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jpbarrette/curlpp @@ -17,10 +15,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets( - CONFIG_PATH lib/cmake/${PORT} - TARGET_PATH share/unofficial-${PORT} -) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT} TARGET_PATH share/unofficial-${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) @@ -31,11 +26,9 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) ) endif() -# Handle copyright -configure_file(${SOURCE_PATH}/doc/LICENSE - ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) - vcpkg_copy_pdbs() +vcpkg_test_cmake(PACKAGE_NAME unofficial-${PORT}) + +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}) -# CMake integration test -#vcpkg_test_cmake(PACKAGE_NAME ${PORT}) |