Skip to content

Commit d3550c5

Browse files
committed
Merge pull request matplotlib#3622 from mdboom/freetype-fix
BLD : fix finding "freetype2"
2 parents 97eb612 + 8915c96 commit d3550c5

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

setupext.py

+8-9
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,11 @@ def __init__(self):
253253
self.set_pkgconfig_path()
254254
status, output = getstatusoutput("pkg-config --help")
255255
self.has_pkgconfig = (status == 0)
256+
if not self.has_pkgconfig:
257+
print("IMPORTANT WARNING:")
258+
print(
259+
" pkg-config is not installed.\n"
260+
" matplotlib may not be able to find some of its dependencies")
256261

257262
def set_pkgconfig_path(self):
258263
pkgconfig_path = sysconfig.get_config_var('LIBDIR')
@@ -981,19 +986,13 @@ def add_flags(self, ext):
981986
pkg_config.setup_extension(
982987
ext, 'freetype2',
983988
default_include_dirs=[
984-
'freetype2', 'lib/freetype2/include',
989+
'include/freetype2', 'freetype2',
990+
'lib/freetype2/include',
985991
'lib/freetype2/include/freetype2'],
986992
default_library_dirs=[
987993
'freetype2/lib'],
988-
default_libraries=['freetype', 'z'],
989-
alt_exec='freetype-config')
994+
default_libraries=['freetype', 'z'])
990995

991-
def get_extension(self):
992-
if sys.platform == 'win32':
993-
return None
994-
ext = make_extension('freetype2', [])
995-
self.add_flags(ext)
996-
return ext
997996

998997

999998
class FT2Font(SetupPackage):

0 commit comments

Comments
 (0)