Skip to content

Commit 5d4c2d0

Browse files
committed
Force using system qhull.
1 parent b471ee2 commit 5d4c2d0

File tree

1 file changed

+2
-15
lines changed

1 file changed

+2
-15
lines changed

setupext.py

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,23 +1318,10 @@ class Qhull(SetupPackage):
13181318

13191319
def check(self):
13201320
self.__class__.found_external = True
1321-
try:
1322-
return self._check_for_pkg_config(
1323-
'libqhull', 'libqhull/qhull_a.h', min_version='2015.2')
1324-
except CheckFailed as e:
1325-
self.__class__.found_pkgconfig = False
1326-
self.__class__.found_external = False
1327-
return str(e) + ' Using local copy.'
1321+
return ' Using system copy.'
13281322

13291323
def add_flags(self, ext):
1330-
if self.found_external:
1331-
pkg_config.setup_extension(ext, 'qhull',
1332-
default_libraries=['qhull'])
1333-
else:
1334-
ext.include_dirs.insert(0, 'extern')
1335-
ext.sources.extend(sorted(glob.glob('extern/libqhull/*.c')))
1336-
if sysconfig.get_config_var('LIBM') == '-lm':
1337-
ext.libraries.extend('m')
1324+
ext.libraries.append('qhull')
13381325

13391326

13401327
class TTConv(SetupPackage):

0 commit comments

Comments
 (0)