X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=setup.py;h=275fc6d8b596d87a364fed8d76b81c55fb466025;hb=167d33249bea7b1b29e78d3ccb29e4dff6e2902c;hp=bb77e5a9517c41734a1907e92ece5ec57438b77b;hpb=34e2c3682fc70e470838303625aeba448def1c15;p=gdcm.git diff --git a/setup.py b/setup.py index bb77e5a9..275fc6d8 100644 --- a/setup.py +++ b/setup.py @@ -8,6 +8,7 @@ ThisModule='gdcmPython' gdcmPythonSrcDir=ThisModule gdcmSrcDir ="src" gdcmJpeg8SrcDir =os.path.join('src', 'jpeg', 'libijg8') +gdcmJpeg12SrcDir =os.path.join('src', 'jpeg', 'libijg12') gdcmvtkSrcDir ="vtk" gdcmDictsDir ="Dicts" gdcmTestDir ="Test" @@ -78,7 +79,7 @@ vtkSources = [] vtkSources.extend(glob.glob(os.path.join(gdcmvtkSrcDir,"vtk*.cxx"))) vtkSources.extend(glob.glob(os.path.join(gdcmSrcDir,"*.cxx"))) vtkSources.extend(Jpeg8Sources) -vtkSources.extend(Jpeg12ources) +vtkSources.extend(Jpeg12Sources) vtkLibraries=["vtkCommon","vtkCommonPython", "vtkIO","vtkIOPython", "vtkFiltering","vtkFilteringPython"] @@ -96,7 +97,8 @@ setup(name=ThisModule, cmdclass={'build_ext':build_extWrap}, # redirects default build_ext ext_modules=[SwigExtension(name='_gdcm', sources=Sources, - include_dirs=[gdcmSrcDir,gdcmJpeg8SrcDir],[gdcmSrcDir,gdcmJpeg12SrcDir], + include_dirs=[gdcmSrcDir,gdcmJpeg8SrcDir, + gdcmSrcDir,gdcmJpeg12SrcDir], libraries=libraries, define_macros=macros, swig_cpp=1,