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

Freebsd compat #2544

Merged
merged 2 commits into from
May 27, 2017
Merged

Freebsd compat #2544

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
092d97f
Fix compilation on FreeBSD with 2 openjpegs
melvyn-sopacua May 26, 2017
5d7480a
Add the FIXME and remove debug code
melvyn-sopacua May 26, 2017
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
7 changes: 7 additions & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ def _add_directory(path, subdir, where=None):
else:
_dbg('Inserting path %s', subdir)
path.insert(where, subdir)
elif subdir in path and where is not None:
path.remove(subdir)
path.insert(where, subdir)


def _find_include_file(self, include):
Expand Down Expand Up @@ -462,6 +465,10 @@ def build_extensions(self):
# Add the directory to the include path so we can include
# <openjpeg.h> rather than having to cope with the versioned
# include path
# FIXME (melvyn-sopacua):
# At this point it's possible that best_path is already in
# self.compiler.include_dirs. Should investigate how that is
# possible.
_add_directory(self.compiler.include_dirs, best_path, 0)
feature.jpeg2000 = 'openjp2'
feature.openjpeg_version = '.'.join(str(x) for x in best_version)
Expand Down