From 71fd395f1a8336fbe4d26f008903c543020331b7 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Mon, 6 Jan 2020 17:55:43 -0500 Subject: [PATCH] [qpid-proton] Update to qpid-proton 0.29.0 (#8122) * [qpid-proton] Update to qpid-proton 0.29.0 - Simplify build - Remove unneeded installed files * [qpid-proton] Address review comments Co-authored-by: Robert Schumacher --- ports/qpid-proton/portfile.cmake | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/ports/qpid-proton/portfile.cmake b/ports/qpid-proton/portfile.cmake index 53aebeb0c6..9fa76cd0c1 100644 --- a/ports/qpid-proton/portfile.cmake +++ b/ports/qpid-proton/portfile.cmake @@ -2,13 +2,13 @@ include(vcpkg_common_functions) vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -vcpkg_find_acquire_program(PYTHON2) +vcpkg_find_acquire_program(PYTHON3) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/qpid-proton - REF 0.28.0 - SHA512 dc253218a076ea56d64e0aaeb6ef9e7345bb9ac700c58b8ea6cb9b3c79d66b0667bcc62cbb45f9ce3455fa8f97b7dfb1c2096d269d1b5b9c5c650ef61a126cfe + REF 0.29.0 + SHA512 81ed701b15c12259164212a39b64b9843e3db4d084d3c270fad2e1de21bc055426dcb767ff4b5a3f2e7f7ea1245acd908d04420b71bd8b24265dda8073f364a2 HEAD_REF next ) @@ -16,7 +16,11 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DPYTHON_EXECUTABLE=${PYTHON2} + -DPYTHON_EXECUTABLE=${PYTHON3} + -DLIB_SUFFIX= + -DBUILD_GO=no + -DBUILD_RUBY=no + -DBUILD_PYTHON=no -DENABLE_JSONCPP=ON -DCMAKE_DISABLE_FIND_PACKAGE_CyrusSASL=ON ) @@ -40,4 +44,8 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) +file(REMOVE ${CURRENT_PACKAGES_DIR}/share/qpid-proton/CMakeLists.txt) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/qpid-proton/tests) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/qpid-proton/examples)