Skip to content
Snippets Groups Projects
Commit 8b29e174 authored by Manuel Günther's avatar Manuel Günther
Browse files

Fixed issue when OpenCV library is not available.

parent 8876219f
No related branches found
No related tags found
No related merge requests found
...@@ -22,7 +22,7 @@ before_install: ...@@ -22,7 +22,7 @@ before_install:
- if [ -n "${NUMPYSPEC}" ]; then sudo apt-get install -qq --force-yes libatlas-dev libatlas-base-dev liblapack-dev gfortran; fi - if [ -n "${NUMPYSPEC}" ]; then sudo apt-get install -qq --force-yes libatlas-dev libatlas-base-dev liblapack-dev gfortran; fi
- if [ -n "${NUMPYSPEC}" ]; then pip install --upgrade pip setuptools; fi - if [ -n "${NUMPYSPEC}" ]; then pip install --upgrade pip setuptools; fi
- if [ -n "${NUMPYSPEC}" ]; then pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel numpy$NUMPYSPEC; fi - if [ -n "${NUMPYSPEC}" ]; then pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel numpy$NUMPYSPEC; fi
- pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel matplotlib==1.3.0 sphinx nose==1.3.0 jinja2==2.6 cpp-coveralls pygments==1.6 setuptools==7.0 - pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel matplotlib==1.3.0 sphinx nose==1.3.0 jinja2==2.6 cpp-coveralls pygments==1.6 setuptools==8.0
install: install:
- python bootstrap.py - python bootstrap.py
- CFLAGS=-coverage ./bin/buildout - CFLAGS=-coverage ./bin/buildout
......
...@@ -18,9 +18,18 @@ build_requires = load_requirements() ...@@ -18,9 +18,18 @@ build_requires = load_requirements()
# Define package version # Define package version
version = open("version.txt").read().rstrip() version = open("version.txt").read().rstrip()
packages = ['boost', 'opencv>=2.0'] packages = ['boost']
boost_modules = ['system'] boost_modules = ['system']
# check if opencv is available
try:
from bob.extension import check_packages
pkg = check_packages(['opencv>=2.0'])
print("Found OpenCV libraries %s" % pkg[0].libraries())
packages.append('opencv>=2.0')
except RuntimeError as e:
print("OpenCV was not found, it will not be availabe during tests")
setup( setup(
name="bob.ip.flandmark", name="bob.ip.flandmark",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment