From 5a1fe74d4a9608f195cd77bbf8860279e5a100d6 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Thu, 4 Oct 2012 17:45:17 +0200
Subject: [PATCH] Fixes to compile on systems with Bob installed by
adminstrator, centrally
---
buildout.cfg | 2 +-
setup.py | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/buildout.cfg b/buildout.cfg
index da72e0c..299753e 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -5,7 +5,7 @@
[buildout]
parts = env flandmark external tests python
eggs = bob
- flandmark
+ xbob.flandmark
newest = false
; Path to Bob's root - No need setting this if Bob is installed centrally
diff --git a/setup.py b/setup.py
index 357aa81..81efb32 100644
--- a/setup.py
+++ b/setup.py
@@ -85,16 +85,16 @@ def setup_bob_extension(ext_name, sources):
ext_name,
sources=sources,
language="c++",
- include_dirs=bob['include_dirs'] + ocv['include_dirs'],
- library_dirs=bob['library_dirs'] + ocv.get('library_dirs', []),
- runtime_library_dirs=bob['library_dirs'] + ocv.get('library_dirs', []),
- libraries=bob['libraries'] + ocv['libraries'],
+ include_dirs=bob.get('include_dirs',[]) + ocv.get('include_dirs',[]),
+ library_dirs=bob.get('library_dirs',[]) + ocv.get('library_dirs', []),
+ runtime_library_dirs=bob.get('library_dirs',[]) + ocv.get('library_dirs', []),
+ libraries=bob.get('libraries',[]) + ocv.get('libraries',[]),
)
setup(
name="xbob.flandmark",
- version="1.0.0",
+ version="1.0.1",
description="Python bindings to the flandmark keypoint localization library",
license="GPLv3",
author='Andre Anjos',
--
GitLab