mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 15:59:00 +08:00
c6928dfb9e
* [python3] Update to 3.11.3 * Force set PythonForBuild on windows * Set LD_LIBRARY_PATH on unix * Always use vcpkg_find_acquire_program(PYTHON3) on windows * Remove LD_LIBRARY_PATH shenanigans * [vtk] Parse python version from include folder * Fix static builds on windows * Pass --with-build-python on unix * [omniorb] Fix python version in patch * Resurrect rpath patch * [python3] fix usage * [gobject-introspection] don't hardcode python version * Update vcpkg_find_aquire_program(PYTHON3) This is also required for gobject-introspection * [paraview] don't hardcode python version * [vtk-dicom] don't hardcode python version * Update python in vcpkgTools.xml * Fix host arch detection in vcpkg_find_acquire_program(PYTHON3) * [libpq] Don't hardcode python version * [shiva] Don't pass python variables * [vcpkg-get-python-packages] Delete unused file, update hardcoded python version * [python3] update to 3.11.4 * [omniorb] Use PREPEND in vcpkg_add_to_path So that python from vcpkg is picked before system python * libpq quickfix * re-fix libpq * fix vcpkg-get-python-packages * Make windows 7 patch compatible with unix builds * Copy pyd files to bin Also fixes copying files that do not belong to current build tree * Fix static builds * Speculatively fix osx regression * Fix omniorb on unix * [gobject-introspection] fix windows builds * [vtk] Update vendored copy of mpi4py for python 3.11 support * [mdl-sdk] Fix python * [gobject-introspection] fix the fix of a fix... * Update versions * Undo changes in gobject-introspection and vcpkg_find_aquire_program(PYTHON3) --------- Co-authored-by: root <root@DESKTOP-UIPL9V8>
30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
diff --git a/giscanner/meson.build b/giscanner/meson.build
|
|
index e63a5ab78..3d7dc678a 100644
|
|
--- a/giscanner/meson.build
|
|
+++ b/giscanner/meson.build
|
|
@@ -97,11 +97,11 @@ giscanner_lib = static_library('giscanner',
|
|
dependencies: [glib_dep, gobject_dep, gio_dep, gmodule_dep],
|
|
)
|
|
|
|
# https://github.com/mesonbuild/meson/issues/4117
|
|
if host_machine.system() == 'windows'
|
|
+ python_ext_dep = libpython_dep
|
|
- python_ext_dep = python.dependency()
|
|
else
|
|
+ python_ext_dep = libpython_dep
|
|
- python_ext_dep = python.dependency().partial_dependency(compile_args: true)
|
|
endif
|
|
|
|
if not python_ext_dep.found()
|
|
diff --git a/meson.build b/meson.build
|
|
index 2a9d68556..cffe9014c 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -156,4 +156,5 @@ libffi_dep = dependency('libffi',
|
|
|
|
# python headers
|
|
-cc.check_header('Python.h', dependencies: [python.dependency()], required: true)
|
|
+libpython_dep = dependency('python-@0@'.format(python_version), method : 'pkg-config')
|
|
+cc.check_header('Python.h', dependencies: [libpython_dep], required: true)
|
|
|