diff options
| author | yurybura <yurybura@gmail.com> | 2020-03-02 21:41:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-02 10:41:27 -0800 |
| commit | 1c414f9192e49963c15bd64cdc2eb308cd046194 (patch) | |
| tree | 0a3d9b95298e2d6fa94817bfc4211bc13aa641ae /ports/boost-python | |
| parent | 1e697e97daf199ac52b5e154bbb9b1a6511aaf2e (diff) | |
| download | vcpkg-1c414f9192e49963c15bd64cdc2eb308cd046194.tar.gz vcpkg-1c414f9192e49963c15bd64cdc2eb308cd046194.zip | |
[boost-python] Try to fix build issue on Linux (#9780)
* [boost-python] Try to fix build issue on Linux
* Update baseline: enable boost-python:x64-linux
* Fix number of processor detection on Linux: use CMake module
* Fix user-config.jam configuration on Linux
* Update baseline: enable boost-mpi:x64-linux
* Fix build boost-regex[icu] on Linux, issue #4962
Diffstat (limited to 'ports/boost-python')
| -rw-r--r-- | ports/boost-python/CONTROL | 4 | ||||
| -rw-r--r-- | ports/boost-python/portfile.cmake | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/ports/boost-python/CONTROL b/ports/boost-python/CONTROL index 84e4434a2..b1e0cba23 100644 --- a/ports/boost-python/CONTROL +++ b/ports/boost-python/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-python
-Version: 1.72.0
-Build-Depends: boost-bind, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, python3 (!osx&!linux)
+Version: 1.72.0-1
+Build-Depends: boost-bind, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, python3
Homepage: https://github.com/boostorg/python
Description: Boost python module
diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake index ec1f706a0..d81d6889c 100644 --- a/ports/boost-python/portfile.cmake +++ b/ports/boost-python/portfile.cmake @@ -10,11 +10,14 @@ vcpkg_from_github( HEAD_REF master
)
-# Find Python. Can't use find_package here, but we already know where everything is
-file(GLOB PYTHON_INCLUDE_PATH "${CURRENT_INSTALLED_DIR}/include/python3.*")
-set(PYTHONLIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib")
-set(PYTHONLIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib")
-string(REGEX REPLACE ".*python([0-9\.]+)$" "\\1" PYTHON_VERSION "${PYTHON_INCLUDE_PATH}")
+# Find Python3 executable
+vcpkg_find_acquire_program(PYTHON3)
+set(VCPKG_PYTHON_EXECUTABLE "${PYTHON3}")
+# Find Python3 libraries. Can't use find_package here, but we already know where everything is
+file(GLOB VCPKG_PYTHON_INCLUDE "${CURRENT_INSTALLED_DIR}/include/python3.*")
+set(VCPKG_PYTHON_LIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib")
+set(VCPKG_PYTHON_LIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib")
+string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" VCPKG_PYTHON_VERSION "${VCPKG_PYTHON_INCLUDE}")
include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
|