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 /scripts/boost | |
| 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 'scripts/boost')
| -rw-r--r-- | scripts/boost/generate-ports.ps1 | 6 | ||||
| -rw-r--r-- | scripts/boost/post-source-stubs/python.cmake | 13 |
2 files changed, 11 insertions, 8 deletions
diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 36ddfe66e..ec32e53fb 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -46,9 +46,9 @@ function Generate() $controlDeps = ($Depends | sort) -join ", "
$versionSuffix = ""
- if ($Name -eq "iostreams")
+ if ($PortName -eq "iostreams" -or $PortName -eq "python")
{
- $versionsuffix = "-1"
+ $versionSuffix = "-1"
}
mkdir "$portsDir/boost-$PortName" -erroraction SilentlyContinue | out-null
@@ -363,7 +363,7 @@ foreach ($library in $libraries) if ($library -eq "python")
{
- $deps += @("python3 (!osx&!linux)")
+ $deps += @("python3")
$needsBuild = $true
}
elseif ($library -eq "iostreams")
diff --git a/scripts/boost/post-source-stubs/python.cmake b/scripts/boost/post-source-stubs/python.cmake index 5610c489d..5e2ae2b76 100644 --- a/scripts/boost/post-source-stubs/python.cmake +++ b/scripts/boost/post-source-stubs/python.cmake @@ -1,5 +1,8 @@ -# 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}")
|