diff options
| author | Adam Johnson <AdamJohnso@gmail.com> | 2021-01-05 16:39:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-05 13:39:53 -0800 |
| commit | 378ffbb940e0a9112f60f837f68db202e2e280bf (patch) | |
| tree | 4794c38aded15ba7c192657cb5ce56100250b6e6 /ports/pybind11 | |
| parent | ebedac7774a1636ea45782a6a9b24a03d45990d0 (diff) | |
| download | vcpkg-378ffbb940e0a9112f60f837f68db202e2e280bf.tar.gz vcpkg-378ffbb940e0a9112f60f837f68db202e2e280bf.zip | |
[python3] Add vcpkg-cmake-wrapper. (#15221)
* [python3] Add vcpkg-cmake-wrapper.cmake.
This is still a WIP... For now, we only remove registry detection on
Windows.
* [python3] Fix Windows static embedding linkage.
* [python3] Fix Linux static library embedding.
* [python3] Fix linkage on macOS.
* [python3] Only link extra libs when static.
* [python3] Bump port version for vcpkg-cmake-wrapper.
* [itk] Remove obsolete Python artifact specification.
* [pybind11] Remove obsolete Python artifact specification.
* [python3] Mark `find_package()` calls as REQUIRED.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* [python3] Bump port version after #15378.
* [python3] Be more selective about when to unleash the nukes.
* [python3] Add usage message.
* [python3] Don't swallow `vcpkg_find_acquire_program`'s Python3.
* [python3] Don't forcibly change the registry find state.
* [python3] fix copypasta error
* [python3] Fix config error with the opensubdiv port.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/pybind11')
| -rw-r--r-- | ports/pybind11/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pybind11/portfile.cmake | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/ports/pybind11/CONTROL b/ports/pybind11/CONTROL index be711e1b1..8b14c31ec 100644 --- a/ports/pybind11/CONTROL +++ b/ports/pybind11/CONTROL @@ -1,6 +1,6 @@ Source: pybind11 Version: 2.6.0 -Port-Version: 1 +Port-Version: 2 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) diff --git a/ports/pybind11/portfile.cmake b/ports/pybind11/portfile.cmake index 458c2a669..e227e0971 100644 --- a/ports/pybind11/portfile.cmake +++ b/ports/pybind11/portfile.cmake @@ -7,23 +7,18 @@ vcpkg_from_github( ) vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYPATH ${PYTHON3} PATH) -vcpkg_add_to_path("${PYPATH}") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DPYBIND11_TEST=OFF - -DPYTHONLIBS_FOUND=ON - -DPYTHON_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include - -DPYTHON_MODULE_EXTENSION=.dll + -DPYBIND11_FINDPYTHON=ON + -DPython3_EXECUTABLE=${PYTHON3} OPTIONS_RELEASE -DPYTHON_IS_DEBUG=OFF - -DPYTHON_LIBRARIES=${CURRENT_INSTALLED_DIR}/lib/python39.lib OPTIONS_DEBUG -DPYTHON_IS_DEBUG=ON - -DPYTHON_LIBRARIES=${CURRENT_INSTALLED_DIR}/debug/lib/python39_d.lib ) vcpkg_install_cmake() |