Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
bob.io.base
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
bob
bob.io.base
Commits
f206f117
Commit
f206f117
authored
10 years ago
by
Manuel Günther
Browse files
Options
Downloads
Patches
Plain Diff
Corrected search order of get_include_directories to match the one in setup.py
parent
8f44928b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
bob/io/base/__init__.py
+5
-5
5 additions, 5 deletions
bob/io/base/__init__.py
with
5 additions
and
5 deletions
bob/io/base/__init__.py
+
5
−
5
View file @
f206f117
...
@@ -219,10 +219,7 @@ def get_include_directories():
...
@@ -219,10 +219,7 @@ def get_include_directories():
"""
Returns a list of include directories for dependent libraries, such as HDF5.
"""
"""
Returns a list of include directories for dependent libraries, such as HDF5.
"""
from
bob.extension
import
pkgconfig
from
bob.extension
import
pkgconfig
# try to use pkg_config first
# try to use pkg_config first
try
:
try
:
pkg
=
pkgconfig
(
'
hdf5
'
)
return
pkg
.
include_directories
()
except
RuntimeError
:
from
bob.extension.utils
import
find_header
from
bob.extension.utils
import
find_header
# locate pkg-config on our own
# locate pkg-config on our own
header
=
'
hdf5.h
'
header
=
'
hdf5.h
'
...
@@ -231,8 +228,11 @@ def get_include_directories():
...
@@ -231,8 +228,11 @@ def get_include_directories():
raise
RuntimeError
(
"
could not find %s
'
s `%s
'
- have you installed %s on this machine?
"
%
(
'
hdf5
'
,
header
,
'
hdf5
'
))
raise
RuntimeError
(
"
could not find %s
'
s `%s
'
- have you installed %s on this machine?
"
%
(
'
hdf5
'
,
header
,
'
hdf5
'
))
return
[
os
.
path
.
dirname
(
candidates
[
0
])]
return
[
os
.
path
.
dirname
(
candidates
[
0
])]
except
RuntimeError
:
pkg
=
pkgconfig
(
'
hdf5
'
)
return
pkg
.
include_directories
()
# gets sphinx autodoc done right - don't remove it
# gets sphinx autodoc done right - don't remove it
__all__
=
[
_
for
_
in
dir
()
if
not
_
.
startswith
(
'
_
'
)]
__all__
=
[
_
for
_
in
dir
()
if
not
_
.
startswith
(
'
_
'
)]
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment