Commit 0757cbdc authored by Sebastien Petitdemange's avatar Sebastien Petitdemange
Browse files

Merge branch 'qt3_no_opencv' into 'master'

Remove opencv dependency (qt3)

See merge request !2
parents 9326615c be3dbcb3
......@@ -85,20 +85,12 @@ pixmaptools_module = Extension(name = "Qub.CTools/pixmaptools",
extra_link_args = extra_link_args+['-l'+qt_lib],
include_dirs = ['Qub/CTools/pixmaptools', numpy.get_include(), qt_inc_dir],
library_dirs = [qt_lib_dir])
opencv_module = Extension(name = "Qub.CTools/opencv",
sources = ["Qub/CTools/opencv/%s.sip" % (QT3 and "opencv_qt3" or "opencv_qt4")]+glob.glob('Qub/CTools/opencv/*.cpp'),
extra_compile_args = extra_compile_args,
extra_link_args = extra_link_args+['-l'+qt_lib, '-lcv'],
include_dirs = ['Qub/CTools/opencv', numpy.get_include(), qt_inc_dir],
library_dirs = [qt_lib_dir])
setup(name = "Qub",version = "1.0",
description = "Qub is a library providing data display tools for PyQt apps",
author="Sebastien Petitdemange, BCU(Bliss), ESRF",
packages = ["Qub", "Qub.CTools", "Qub.Data", "Qub.Data.Plug", "Qub.Data.Source", "Qub.Data.StreamIO", "Qub.Data.Scale", "Qub.Data.Class", "Qub.Icons", "Qub.Objects", "Qub.Objects.Mosaic", "Qub.Plugins", "Qub.Print", "Qub.Tools", "Qub.Widget", "Qub.Widget.DataSource", "Qub.Widget.Graph"],
package_data = {"Qub.Icons":["IconsLibrary/*"], "Qub.Widget":["*.ui"]},
ext_modules=[polygone_module,dataresize_module,mar345_module,pixmaptools_module, qttools_module,opencv_module],
ext_modules=[polygone_module,dataresize_module,mar345_module,pixmaptools_module, qttools_module],
cmdclass={'build_ext': my_own_build_ext})
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment