Skip to content

Install pywrapper.h alongside symengine/lib/symengine.pxd #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 23, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@ def finalize_options(self):
cmake_opts.extend(self.define)
cmake_build_type[0] = self.build_type
cmake_opts.extend([('PYTHON_INSTALL_PATH', path.join(os.getcwd(), self.install_platlib))])
cmake_opts.extend([('PYTHON_INSTALL_HEADER_PATH',
path.join(os.getcwd(), self.install_headers))])
#cmake_opts.extend([('PYTHON_INSTALL_HEADER_PATH',
# path.join(os.getcwd(), self.install_headers))])

def cmake_install(self):
source_dir = path.dirname(path.realpath(__file__))
Expand Down
6 changes: 5 additions & 1 deletion symengine/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ set(SRC
configure_file(config.pxi.in config.pxi)

include_directories(BEFORE ${python_wrapper_BINARY_DIR}/symengine/lib)
add_subdirectory(symengine)

cython_add_module_pyx(symengine_wrapper symengine.pxd)
add_python_library(symengine_wrapper ${SRC})
Expand Down Expand Up @@ -35,3 +34,8 @@ install(FILES __init__.py
symengine_wrapper.pxd
DESTINATION ${PY_PATH}
)

install(FILES
pywrapper.h
DESTINATION ${PYTHON_INSTALL_PATH}/symengine/lib
)
2 changes: 1 addition & 1 deletion symengine/lib/pywrapper.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <symengine/pywrapper.h>
#include "pywrapper.h"

#if PY_MAJOR_VERSION >= 3
#define PyInt_FromLong PyLong_FromLong
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions symengine/lib/symengine.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ cdef extern from "<symengine/number.h>" namespace "SymEngine":
cdef cppclass NumberWrapper(Basic):
pass

cdef extern from "<symengine/pywrapper.h>" namespace "SymEngine":
cdef extern from "pywrapper.h" namespace "SymEngine":
cdef cppclass PyNumber(NumberWrapper):
PyObject* get_py_object()
cdef cppclass PyModule:
Expand All @@ -304,7 +304,7 @@ cdef extern from "<symengine/pywrapper.h>" namespace "SymEngine":
cdef cppclass PyFunction:
PyObject* get_py_object()

cdef extern from "<symengine/pywrapper.h>" namespace "SymEngine":
cdef extern from "pywrapper.h" namespace "SymEngine":
cdef cppclass PySymbol(Symbol):
PySymbol(string name, PyObject* pyobj)
PyObject* get_py_object()
Expand Down
4 changes: 0 additions & 4 deletions symengine/lib/symengine/CMakeLists.txt

This file was deleted.