From 46361ca058295e3f08d3c54196d990c497834306 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 30 Mar 2018 03:15:51 -0400 Subject: [PATCH] Force using system qhull. Signed-off-by: Elliott Sales de Andrade --- setupext.py | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/setupext.py b/setupext.py index d2ff239ad..30e0c9085 100644 --- a/setupext.py +++ b/setupext.py @@ -1318,23 +1318,10 @@ class Qhull(SetupPackage): def check(self): self.__class__.found_external = True - try: - return self._check_for_pkg_config( - 'libqhull', 'libqhull/qhull_a.h', min_version='2015.2') - except CheckFailed as e: - self.__class__.found_pkgconfig = False - self.__class__.found_external = False - return str(e) + ' Using local copy.' + return ' Using system copy.' def add_flags(self, ext): - if self.found_external: - pkg_config.setup_extension(ext, 'qhull', - default_libraries=['qhull']) - else: - ext.include_dirs.insert(0, 'extern') - ext.sources.extend(sorted(glob.glob('extern/libqhull/*.c'))) - if sysconfig.get_config_var('LIBM') == '-lm': - ext.libraries.extend('m') + ext.libraries.append('qhull') class TTConv(SetupPackage): -- 2.14.3