diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-05-21 21:00:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-21 21:00:24 -0700 |
| commit | 33af90d42af68ef343edb00a69b1e11548a9e2e1 (patch) | |
| tree | c338f44bd8a960e8eafc52b91f6a1f666a927512 /ports/qpid-proton | |
| parent | e16f9c29a05aa178ce8a476a293723ab92f08f89 (diff) | |
| download | vcpkg-33af90d42af68ef343edb00a69b1e11548a9e2e1.tar.gz vcpkg-33af90d42af68ef343edb00a69b1e11548a9e2e1.zip | |
[many ports] Updates 2019.05.19 (#6524)
Diffstat (limited to 'ports/qpid-proton')
| -rw-r--r-- | ports/qpid-proton/CONTROL | 4 | ||||
| -rw-r--r-- | ports/qpid-proton/portfile.cmake | 34 |
2 files changed, 19 insertions, 19 deletions
diff --git a/ports/qpid-proton/CONTROL b/ports/qpid-proton/CONTROL index 3ce196241..88fa09d74 100644 --- a/ports/qpid-proton/CONTROL +++ b/ports/qpid-proton/CONTROL @@ -1,4 +1,4 @@ Source: qpid-proton
-Version: 0.24.0-2
-Build-Depends: openssl, libuv (osx)
+Version: 0.28.0
+Build-Depends: openssl (!windows&!uwp), libuv (osx), jsoncpp
Description: Qpid Proton is a high-performance, lightweight messaging library.
diff --git a/ports/qpid-proton/portfile.cmake b/ports/qpid-proton/portfile.cmake index 760f74371..53aebeb0c 100644 --- a/ports/qpid-proton/portfile.cmake +++ b/ports/qpid-proton/portfile.cmake @@ -1,43 +1,43 @@ include(vcpkg_common_functions) -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -# Use this throughout rather than literal string -set(QPID_PROTON_VERSION 0.24.0) vcpkg_find_acquire_program(PYTHON2) -# Go grab the code. Set SHA512 to 1 to get correct sha from download vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/qpid-proton - REF ${QPID_PROTON_VERSION} - SHA512 a22154d5ea96330e22245a54233101256f02d10ee814a7f0f4b654e56128615acee0cfc0387cbec9b877dd20cc23a5b1635aa9e1d1b60a4b9aa985e449dcb62e + REF 0.28.0 + SHA512 dc253218a076ea56d64e0aaeb6ef9e7345bb9ac700c58b8ea6cb9b3c79d66b0667bcc62cbb45f9ce3455fa8f97b7dfb1c2096d269d1b5b9c5c650ef61a126cfe HEAD_REF next ) -# Run cmake configure step vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS + PREFER_NINJA + OPTIONS -DPYTHON_EXECUTABLE=${PYTHON2} + -DENABLE_JSONCPP=ON + -DCMAKE_DISABLE_FIND_PACKAGE_CyrusSASL=ON ) -# Run cmake install step vcpkg_install_cmake() -# Copy across any pdbs generated vcpkg_copy_pdbs() -# Rename share subdirectory -file(RENAME ${CURRENT_PACKAGES_DIR}/share/proton-${QPID_PROTON_VERSION} - ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(GLOB SHARE_DIR ${CURRENT_PACKAGES_DIR}/share/*) +file(RENAME ${SHARE_DIR} ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/cmake/tmp) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/tmp) +file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/Proton ${CURRENT_PACKAGES_DIR}/lib/cmake/tmp/Proton) +file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/Proton ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/tmp/Proton) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/tmp/Proton TARGET_PATH share/proton) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ProtonCpp TARGET_PATH share/protoncpp) -# Vcpkg expects file with name "copyright" file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) -# Remove extraneous unrequired-for-vcpkg files file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/qpid-proton/examples) |