diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2016-04-25 11:56:58 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <wjp@usecode.org> | 2016-04-25 11:56:58 +0200 |
| commit | c659dd8c2f1d5dcb9cc00e2a8786588ae8427278 (patch) | |
| tree | 1876025419b898106af3ee3bbab09a210ddc6b56 | |
| parent | aa89da16f3a031a6ec19b6b19df64e681468f2d6 (diff) | |
| parent | 93eacadc5b94f8e1241dc6836be27d16881a2826 (diff) | |
| download | astra-c659dd8c2f1d5dcb9cc00e2a8786588ae8427278.tar.gz astra-c659dd8c2f1d5dcb9cc00e2a8786588ae8427278.tar.bz2 astra-c659dd8c2f1d5dcb9cc00e2a8786588ae8427278.tar.xz astra-c659dd8c2f1d5dcb9cc00e2a8786588ae8427278.zip | |
Merge pull request #46 from dmpelt/python_cxx
Use CXX for Python compilation as well
| -rw-r--r-- | build/linux/Makefile.in | 6 | ||||
| -rw-r--r-- | python/astra/extrautils.pyx | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index a199bf6..f10f482 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -281,13 +281,15 @@ ifeq ($(python),yes) py: libastra.la $(MKDIR) python/build $(MKDIR) python/finalbuild - cd $(srcdir)/../../python; CPPFLAGS="${PYCPPFLAGS}" LDFLAGS="${PYLDFLAGS}" $(PYTHON) builder.py build --build-base=$(abs_top_builddir)/python/build install \ + # Note: setting CC to CXX is intentional. Python uses CC for compilation even if input is C++. + cd $(srcdir)/../../python; CXX="${CXX}" CC="${CXX}" CPPFLAGS="${PYCPPFLAGS}" LDFLAGS="${PYLDFLAGS}" $(PYTHON) builder.py build --build-base=$(abs_top_builddir)/python/build install \ --install-base=$(abs_top_builddir)/python/finalbuild --install-headers=$(abs_top_builddir)/python/finalbuild --install-purelib=$(abs_top_builddir)/python/finalbuild \ --install-platlib=$(abs_top_builddir)/python/finalbuild --install-scripts=$(abs_top_builddir)/python/finalbuild --install-data=$(abs_top_builddir)/python/finalbuild python-root-install: libastra.la $(MKDIR) python/build - cd $(srcdir)/../../python; CPPFLAGS="${PYCPPFLAGS}" LDFLAGS="${PYLDFLAGS}" $(PYTHON) builder.py build --build-base=$(abs_top_builddir)/python/build install + # Note: setting CC to CXX is intentional. Python uses CC for compilation even if input is C++. + cd $(srcdir)/../../python; CXX="${CXX}" CC="${CXX}" CPPFLAGS="${PYCPPFLAGS}" LDFLAGS="${PYLDFLAGS}" $(PYTHON) builder.py build --build-base=$(abs_top_builddir)/python/build install endif diff --git a/python/astra/extrautils.pyx b/python/astra/extrautils.pyx index 5bc315f..2c7771e 100644 --- a/python/astra/extrautils.pyx +++ b/python/astra/extrautils.pyx @@ -22,6 +22,8 @@ # along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. # # ----------------------------------------------------------------------- +# distutils: language = c++ + def clipCircle(img): cdef int i,j |