Skip to content

stubgen: add LIB_PATH option to locate dependent shared libraries #1045

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

stubgen: add LIB_PATH option to locate dependent shared libraries #1045

Show file tree
Hide file tree
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
6 changes: 5 additions & 1 deletion cmake/nanobind-config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ endfunction()
# ---------------------------------------------------------------------------

function (nanobind_add_stub name)
cmake_parse_arguments(PARSE_ARGV 1 ARG "VERBOSE;INCLUDE_PRIVATE;EXCLUDE_DOCSTRINGS;INSTALL_TIME;EXCLUDE_FROM_ALL" "MODULE;OUTPUT;MARKER_FILE;COMPONENT;PATTERN_FILE" "PYTHON_PATH;DEPENDS")
cmake_parse_arguments(PARSE_ARGV 1 ARG "VERBOSE;INCLUDE_PRIVATE;EXCLUDE_DOCSTRINGS;INSTALL_TIME;EXCLUDE_FROM_ALL" "MODULE;OUTPUT;MARKER_FILE;COMPONENT;PATTERN_FILE" "PYTHON_PATH;LIB_PATH;DEPENDS")

if (EXISTS ${NB_DIR}/src/stubgen.py)
set(NB_STUBGEN "${NB_DIR}/src/stubgen.py")
Expand Down Expand Up @@ -590,6 +590,10 @@ function (nanobind_add_stub name)
list(APPEND NB_STUBGEN_ARGS -i "${TMP}")
endforeach()

foreach (TMP IN LISTS ARG_LIB_PATH)
list(APPEND NB_STUBGEN_ARGS -L "${TMP}")
endforeach()

if (ARG_PATTERN_FILE)
list(APPEND NB_STUBGEN_ARGS -p "${ARG_PATTERN_FILE}")
endif()
Expand Down
21 changes: 21 additions & 0 deletions src/stubgen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,6 +1210,16 @@ def parse_options(args: List[str]) -> argparse.Namespace:
help="add the directory to the Python import path (can specify multiple times)",
)

parser.add_argument(
"-L",
"--lib-path",
action="append",
metavar="PATH",
dest="lib_paths",
default=[],
help="add directory to shared library search path (can specify multiple times)"
)

parser.add_argument(
"-m",
"--module",
Expand Down Expand Up @@ -1342,6 +1352,7 @@ def add_pattern(query: str, lines: List[str]):

def main(args: Optional[List[str]] = None) -> None:
import sys
import os

# Ensure that the current directory is on the path
if "" not in sys.path and "." not in sys.path:
Expand All @@ -1362,6 +1373,16 @@ def main(args: Optional[List[str]] = None) -> None:
for i in opt.imports:
sys.path.insert(0, i)

if os.name == 'nt':
for lib_path in opt.lib_paths:
os.add_dll_directory(lib_path)
else:
lib_env = "DYLD_LIBRARY_PATH" if sys.platform == "darwin" else "LD_LIBRARY_PATH"
old_value = os.environ.get(lib_env, "")
paths_str = ":".join(opt.lib_paths)
if paths_str:
os.environ[lib_env] = f"{paths_str}:{old_value}" if old_value else paths_str

for i, mod in enumerate(opt.modules):
if not opt.quiet:
if i > 0:
Expand Down