From 8d50672e044c9025ce7a37695949f872907d80b8 Mon Sep 17 00:00:00 2001 From: Anand Balakrishnan Date: Mon, 13 Jul 2020 11:04:14 -0700 Subject: [PATCH] [pybind11] Update to v2.5.0 (#12394) * [pybind11] Update to v2.5.0 * Address comments in PR --- ports/pybind11/CONTROL | 4 ++-- ports/pybind11/portfile.cmake | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ports/pybind11/CONTROL b/ports/pybind11/CONTROL index 8c50388da..b01861122 100644 --- a/ports/pybind11/CONTROL +++ b/ports/pybind11/CONTROL @@ -1,5 +1,5 @@ Source: pybind11 -Version: 2.4.3 +Version: 2.5.0 Homepage: https://github.com/pybind/pybind11 Description: pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code. -Build-Depends: python3 (windows) \ No newline at end of file +Build-Depends: python3 (windows) diff --git a/ports/pybind11/portfile.cmake b/ports/pybind11/portfile.cmake index 8c2a8fdde..0c8778a7f 100644 --- a/ports/pybind11/portfile.cmake +++ b/ports/pybind11/portfile.cmake @@ -1,17 +1,14 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pybind/pybind11 - REF 80d452484c5409444b0ec19383faa84bb7a4d351 # v2.4.3 - SHA512 987f8c075ff3e4f90ab27a6121f3767a82939e35cd2143649819c8d39b09d1c234d39fa204ed5f6bd1d9ec97c275f590df358769d7726a16ccb720a91c550883 + REF 3b1dbebabc801c9cf6f0953a4c20b904d444f879 # v2.5.0 + SHA512 1a75d29447dbba96eebf8ecdebad1be0dd5327c32f5122b0ece9d9ec22eae4feacd0efb3a5070b3a135a892b1682c7215b0c529b179493694df932945a379f4c HEAD_REF master ) vcpkg_find_acquire_program(PYTHON3) - get_filename_component(PYPATH ${PYTHON3} PATH) -set(ENV{PATH} "$ENV{PATH};${PYPATH}") +vcpkg_add_to_path("${PYPATH}") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -34,4 +31,4 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/) # copy license -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/pybind11/copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)