Skip to content

Commit dab724a

Browse files
committed
Merge pull request #2531 from ianthomas23/extern_directory
Move external libraries to 'extern' directory
2 parents 8162371 + 0d288b3 commit dab724a

File tree

229 files changed

+8
-7
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

229 files changed

+8
-7
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

setupext.py

+8-7
Original file line numberDiff line numberDiff line change
@@ -824,8 +824,9 @@ def add_flags(self, ext):
824824
'cxxextensions.c']])
825825
pkg_config.setup_extension(ext, 'PyCXX')
826826
else:
827-
ext.sources.extend(glob.glob('CXX/*.cxx'))
828-
ext.sources.extend(glob.glob('CXX/*.c'))
827+
ext.include_dirs.append('extern')
828+
ext.sources.extend(glob.glob('extern/CXX/*.cxx'))
829+
ext.sources.extend(glob.glob('extern/CXX/*.c'))
829830
ext.define_macros.append(('PYCXX_ISO_CPP_LIB', '1'))
830831
if PY3:
831832
ext.define_macros.append(('PYCXX_PYTHON_2TO3', '1'))
@@ -850,7 +851,7 @@ def add_flags(self, ext):
850851
if self.found_external:
851852
pkg_config.setup_extension(ext, 'libagg')
852853
else:
853-
ext.include_dirs.append('agg24/include')
854+
ext.include_dirs.append('extern/agg24/include')
854855
agg_sources = [
855856
'agg_bezier_arc.cpp',
856857
'agg_curves.cpp',
@@ -862,7 +863,7 @@ def add_flags(self, ext):
862863
'agg_vpgen_segmentator.cpp'
863864
]
864865
ext.sources.extend(
865-
os.path.join('agg24', 'src', x) for x in agg_sources)
866+
os.path.join('extern', 'agg24', 'src', x) for x in agg_sources)
866867

867868

868869
class FreeType(SetupPackage):
@@ -939,9 +940,9 @@ class TTConv(SetupPackage):
939940
def get_extension(self):
940941
sources = [
941942
'src/_ttconv.cpp',
942-
'ttconv/pprdrv_tt.cpp',
943-
'ttconv/pprdrv_tt2.cpp',
944-
'ttconv/ttutil.cpp'
943+
'extern/ttconv/pprdrv_tt.cpp',
944+
'extern/ttconv/pprdrv_tt2.cpp',
945+
'extern/ttconv/ttutil.cpp'
945946
]
946947
ext = make_extension('matplotlib.ttconv', sources)
947948
Numpy().add_flags(ext)

0 commit comments

Comments
 (0)