IQ.Lvbs/pycapnp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing compilation errors with capnproto-7.0.0

Browse Source
This commit is contained in:
Jacob Alexander
2019-09-16 21:33:56 -07:00
parent bc1a3a5f3f
commit de22f7eb97
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
buildutils/detect.py
View File

@@ -58,7 +58,7 @@ def test_compilation(cfile, compiler=None, **compiler_attrs):
else: else:
lpreargs = ['-m64'] lpreargs = ['-m64']
extra = compiler_attrs.get('extra_compile_args', []) extra = compiler_attrs.get('extra_compile_args', [])
extra += ['--std=c++11'] extra += ['--std=c++14']
objs = cc.compile([cfile], extra_preargs=cpreargs, extra_postargs=extra) objs = cc.compile([cfile], extra_preargs=cpreargs, extra_postargs=extra)
cc.link_executable(objs, efile, extra_preargs=lpreargs) cc.link_executable(objs, efile, extra_preargs=lpreargs)

2
capnp/includes/capnp_cpp.pxd
View File

@@ -1,6 +1,6 @@
# schema.capnp.cpp.pyx # schema.capnp.cpp.pyx
# distutils: language = c++ # distutils: language = c++
# distutils: extra_compile_args = --std=c++11 # distutils: extra_compile_args = --std=c++14
cdef extern from "capnp/helpers/checkCompiler.h": cdef extern from "capnp/helpers/checkCompiler.h":
pass pass

2
capnp/includes/schema_cpp.pxd
View File

@@ -1,6 +1,6 @@
# schema.capnp.cpp.pyx # schema.capnp.cpp.pyx
# distutils: language = c++ # distutils: language = c++
# distutils: extra_compile_args = --std=c++11 # distutils: extra_compile_args = --std=c++14
from libc.stdint cimport * from libc.stdint cimport *
from capnp_cpp cimport DynamicOrphan from capnp_cpp cimport DynamicOrphan

2
capnp/lib/capnp.pyx
View File

@@ -1,6 +1,6 @@
# capnp.pyx # capnp.pyx
# distutils: language = c++ # distutils: language = c++
# distutils: extra_compile_args = --std=c++11 # distutils: extra_compile_args = --std=c++14
# distutils: libraries = capnpc capnp-rpc capnp kj-async kj # distutils: libraries = capnpc capnp-rpc capnp kj-async kj
# distutils: include_dirs = . # distutils: include_dirs = .
# cython: c_string_type = str # cython: c_string_type = str

2
capnp/templates/module.pyx
View File

@@ -1,6 +1,6 @@
# addressbook_fast.pyx # addressbook_fast.pyx
# distutils: language = c++ # distutils: language = c++
# distutils: extra_compile_args = --std=c++11 # distutils: extra_compile_args = --std=c++14
# distutils: include_dirs = {{include_dir}} # distutils: include_dirs = {{include_dir}}
# distutils: libraries = capnpc capnp capnp-rpc # distutils: libraries = capnpc capnp capnp-rpc
# distutils: sources = {{file.filename}}.cpp # distutils: sources = {{file.filename}}.cpp

2
setup.py
View File

@@ -138,7 +138,7 @@ else:
extensions = [Extension("capnp.lib.capnp", ["capnp/lib/capnp.cpp"], extensions = [Extension("capnp.lib.capnp", ["capnp/lib/capnp.cpp"],
include_dirs=["."], include_dirs=["."],
language='c++', language='c++',
extra_compile_args=['--std=c++11'], extra_compile_args=['--std=c++14'],
libraries=['capnpc', 'capnp-rpc', 'capnp', 'kj-async', 'kj'])] libraries=['capnpc', 'capnp-rpc', 'capnp', 'kj-async', 'kj'])]
setup( setup(