Merge pull request #164 from isuruf/pywrapper.h

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

Author: isuruf

setup.py

@@ -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__))

symengine/lib/CMakeLists.txt

@@ -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})
@@ -35,3 +34,8 @@ install(FILES __init__.py
     symengine_wrapper.pxd
     DESTINATION ${PY_PATH}
     )
+
+install(FILES
+    pywrapper.h
+    DESTINATION ${PYTHON_INSTALL_PATH}/symengine/lib
+    )

symengine/lib/pywrapper.cpp

@@ -1,4 +1,4 @@
-#include <symengine/pywrapper.h>
+#include "pywrapper.h"
 
 #if PY_MAJOR_VERSION >= 3
 #define PyInt_FromLong PyLong_FromLong

symengine/lib/symengine/pywrapper.h renamed to symengine/lib/pywrapper.h

@@ -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:
@@ -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()