Removed system pybind11 deps, added LICENCE, other housekeeping.
parent
ad85ccc0e5
commit
da01b5e910
|
@ -0,0 +1,21 @@
|
||||||
|
MIT License
|
||||||
|
|
||||||
|
Copyright (c) 2017 Sofus Rose
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
|
@ -28,7 +28,7 @@ long_line_column=72
|
||||||
|
|
||||||
[files]
|
[files]
|
||||||
current_page=0
|
current_page=0
|
||||||
FILE_NAME_0=1995;Python;0;EUTF-8;1;1;0;%2Fhome%2Fsofus%2Fsubhome%2Fsrc%2Fopenlut%2Fopenlut.py;0;4
|
FILE_NAME_0=331;Python;0;EUTF-8;1;1;0;%2Fhome%2Fsofus%2Fsubhome%2Fsrc%2Fopenlut%2Fsetup.py;0;4
|
||||||
|
|
||||||
[VTE]
|
[VTE]
|
||||||
last_dir=/home/sofus/subhome/src/linemarch
|
last_dir=/home/sofus/subhome/src/linemarch
|
15
setup.py
15
setup.py
|
@ -3,17 +3,12 @@
|
||||||
import sys, os
|
import sys, os
|
||||||
import os.path as path
|
import os.path as path
|
||||||
|
|
||||||
#~ from sysconfig import get_python_version, get_path
|
|
||||||
|
|
||||||
from setuptools import setup
|
from setuptools import setup
|
||||||
from setuptools import Extension
|
from setuptools import Extension
|
||||||
from setuptools import find_packages
|
from setuptools import find_packages
|
||||||
|
|
||||||
#Weirdly long way to get to the actual header files we need to include.
|
#pybind11, a dependency, can report its own includes!
|
||||||
#~ pyPath = path.join(path.abspath(get_path('include') + os.sep + '..'), 'site/python{}'.format(get_python_version()))
|
import pybind11
|
||||||
|
|
||||||
#Better - Mac & Linux only.
|
|
||||||
#~ pyPath = '/usr/local/include/python{}'.format(get_python_version())'
|
|
||||||
|
|
||||||
#Make sure we're using gcc.
|
#Make sure we're using gcc.
|
||||||
os.environ["CC"] = "g++"
|
os.environ["CC"] = "g++"
|
||||||
|
@ -24,7 +19,7 @@ link_args = ['-fopenmp']
|
||||||
|
|
||||||
olOpt = Extension( 'openlut.lib.olOpt',
|
olOpt = Extension( 'openlut.lib.olOpt',
|
||||||
sources = ['openlut/lib/olOpt.cpp'],
|
sources = ['openlut/lib/olOpt.cpp'],
|
||||||
#~ include_dirs=[pyPath], #Include from the the python3 source code.
|
include_dirs=[pybind11.get_include()], #Include pybind11.
|
||||||
language = 'c++',
|
language = 'c++',
|
||||||
extra_compile_args = cpp_args,
|
extra_compile_args = cpp_args,
|
||||||
extra_link_args = cpp_args
|
extra_link_args = cpp_args
|
||||||
|
@ -43,9 +38,9 @@ setup( name = 'openlut',
|
||||||
|
|
||||||
license = 'MIT Licence',
|
license = 'MIT Licence',
|
||||||
|
|
||||||
keywords = 'color image images processing',
|
keywords = ['color', 'image', 'images', 'processing'],
|
||||||
|
|
||||||
install_requires = ['numpy', 'wand', 'scipy', 'pygame','PyOpenGL', 'setuptools'],
|
install_requires = ['numpy', 'wand', 'scipy', 'pygame','PyOpenGL', 'setuptools', 'pybind11'],
|
||||||
|
|
||||||
classifiers = [
|
classifiers = [
|
||||||
'Development Status :: 3 - Alpha',
|
'Development Status :: 3 - Alpha',
|
||||||
|
|
Loading…
Reference in New Issue