Skip to content

Allows Windows machines to find pip-installed PyBind11 #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
steven-johnson merged 1 commit into from
Jul 28, 2022
Merged

Allows Windows machines to find pip-installed PyBind11 #208

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion master/master.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,8 @@ def get_halide_cmake_definitions(builder_type, halide_target='host', wasm_jit='w

if builder_type.os == 'windows':
cmake_definitions['CMAKE_TOOLCHAIN_FILE'] = Interpolate('%(prop:VCPKG_ROOT)s/scripts/buildsystems/vcpkg.cmake')
# CMake on Windows can't reliably find our pip-installed PyBind11 unless we set CMAKE_PREFIX_PATH to point to is
cmake_definitions['pybind11_DIR'] = Interpolate('%(prop:VIRTUAL_ENV)s/share/cmake/pybind11')

# TODO: HALIDE_NODE_JS_PATH is only necessary until EMSDK updates their built-in version of Node
# to v16.13+; when that is done, remove this definition.
Expand Down Expand Up @@ -736,7 +738,8 @@ def add_env_setup_step(factory, builder_type, enable_ccache=False):
variables=['VCPKG_ROOT',
'LD_LIBRARY_PATH',
'HL_HEXAGON_TOOLS',
'HALIDE_NODE_JS_PATH']))
'HALIDE_NODE_JS_PATH'
'VIRTUAL_ENV']))

vcpkg_root = Property('VCPKG_ROOT', default=None)

Expand Down