aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan <ryan__mckenzie@hotmail.com>2021-08-10 01:00:44 -0700
committerGitHub <noreply@github.com>2021-08-10 01:00:44 -0700
commitbd66ddea982ff5260d11d00dc22af07e5dc0270f (patch)
tree7667524e8bc3a883ee56fa1c8749c4c032d27699
parent45768239ee52b1e100bfb8aa5d9e6fe57d064b0b (diff)
downloadvcpkg-bd66ddea982ff5260d11d00dc22af07e5dc0270f.tar.gz
vcpkg-bd66ddea982ff5260d11d00dc22af07e5dc0270f.zip
[pybind11] Update to 2.7.1 (#19375)
* update to 2.7.1 * use `semver` version field * fixup deprecated commands * apply cmake guidelines for quoting arguments * set `Python_EXECUTABLE` instead pybind11 uses the `FindPython` module instead of `FindPython3` * update baseline * skip passing python executable on command line * update baseline * remove extraneous quotes * remove unused function call * update baseline
-rw-r--r--ports/pybind11/portfile.cmake20
-rw-r--r--ports/pybind11/vcpkg.json12
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/p-/pybind11.json5
4 files changed, 24 insertions, 15 deletions
diff --git a/ports/pybind11/portfile.cmake b/ports/pybind11/portfile.cmake
index 3d2e13398..14e4d5a9a 100644
--- a/ports/pybind11/portfile.cmake
+++ b/ports/pybind11/portfile.cmake
@@ -1,30 +1,26 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO pybind/pybind11
- REF 8de7772cc72daca8e947b79b83fea46214931604 # v2.6.2
- SHA512 9bb688209791bd5f294fa316ab9a8007f559673a733b796e76e223fe8653d048d3f01eb045b78aa1843f7eacf97f6e2ee090ac68fed2b43856eb0c4813583204
+ REF v2.7.1
+ SHA512 f09f46622b394d3990ab82aa7ea15a06e298df109cd2df263ba9d6ac7fb248217df7450e1954a9679a8360335d5bbf662926a34c8b7c61b6e4c396bbdfd88305
HEAD_REF master
)
-vcpkg_find_acquire_program(PYTHON3)
-
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
+vcpkg_cmake_configure(
+ SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DPYBIND11_TEST=OFF
-DPYBIND11_FINDPYTHON=ON
- -DPython3_EXECUTABLE=${PYTHON3}
OPTIONS_RELEASE
-DPYTHON_IS_DEBUG=OFF
OPTIONS_DEBUG
-DPYTHON_IS_DEBUG=ON
)
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/pybind11)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/pybind11")
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/")
# copy license
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/pybind11/vcpkg.json b/ports/pybind11/vcpkg.json
index a760e31e8..cf79d7513 100644
--- a/ports/pybind11/vcpkg.json
+++ b/ports/pybind11/vcpkg.json
@@ -1,9 +1,17 @@
{
"name": "pybind11",
- "version": "2.6.2",
+ "version-semver": "2.7.1",
"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",
"homepage": "https://github.com/pybind/pybind11",
"dependencies": [
- "python3"
+ "python3",
+ {
+ "name": "vcpkg-cmake",
+ "host": true
+ },
+ {
+ "name": "vcpkg-cmake-config",
+ "host": true
+ }
]
}
diff --git a/versions/baseline.json b/versions/baseline.json
index 7d63b0a5f..dbb585b8a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5121,7 +5121,7 @@
"port-version": 0
},
"pybind11": {
- "baseline": "2.6.2",
+ "baseline": "2.7.1",
"port-version": 0
},
"pystring": {
diff --git a/versions/p-/pybind11.json b/versions/p-/pybind11.json
index b3c3b90b2..2a54f4b5a 100644
--- a/versions/p-/pybind11.json
+++ b/versions/p-/pybind11.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "a8d7e31e74a9d73e4956e70efbcc0c3490968883",
+ "version-semver": "2.7.1",
+ "port-version": 0
+ },
+ {
"git-tree": "e24d24b2afa6506e1dbea1bb922be82d0f4ffafb",
"version": "2.6.2",
"port-version": 0