Skip to content
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

Jump to bottom

Fixed type handling for include and lib directories #7069

Merged
merged 3 commits into from
Apr 11, 2023
Merged

Fixed type handling for include and lib directories #7069

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d94239a
Handle polymorphic types for lib_root and include_root in setup.py
adisbladis Apr 5, 2023
fe4e52d
Rearranged code
radarhere Apr 5, 2023
6fce7d6
Merge branch 'main' into include-dir-type-confusion
radarhere Apr 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,9 +473,13 @@ def build_extensions(self):
lib_root = include_root = root

if lib_root is not None:
if not isinstance(lib_root, (tuple, list)):
lib_root = (lib_root,)
for lib_dir in lib_root:
_add_directory(library_dirs, lib_dir)
if include_root is not None:
if not isinstance(include_root, (tuple, list)):
include_root = (include_root,)
for include_dir in include_root:
_add_directory(include_dirs, include_dir)

Expand Down