diff options
Diffstat (limited to 'cpp/bindings/qpid/python')
| -rw-r--r-- | cpp/bindings/qpid/python/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | cpp/bindings/qpid/python/Makefile.am | 4 | ||||
| -rw-r--r-- | cpp/bindings/qpid/python/python.i | 4 |
3 files changed, 12 insertions, 9 deletions
diff --git a/cpp/bindings/qpid/python/CMakeLists.txt b/cpp/bindings/qpid/python/CMakeLists.txt index 9cb40162a5..2693475dea 100644 --- a/cpp/bindings/qpid/python/CMakeLists.txt +++ b/cpp/bindings/qpid/python/CMakeLists.txt @@ -21,17 +21,20 @@ ## Use Swig to generate a literal binding to the C++ API ##------------------------------------------------------ set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i PROPERTIES CPLUSPLUS ON) -set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i PROPERTIES SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include") +set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i + PROPERTIES SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include;-I${qpid-cpp_SOURCE_DIR}/bindings") swig_add_module(cqpid_python python ${CMAKE_CURRENT_SOURCE_DIR}/python.i) swig_link_libraries(cqpid_python qpidmessaging qpidtypes qmf2 ${PYTHON_LIBRARIES}) -set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "-fno-strict-aliasing -I${PYTHON_INCLUDE_PATH} -I${qpid-cpp_SOURCE_DIR}/include") +set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "-fno-strict-aliasing") +include_directories(${PYTHON_INCLUDE_PATH} + ${qpid-cpp_SOURCE_DIR}/include + ${qpid-cpp_SOURCE_DIR}/bindings) ##------------------------------------ ## Install the complete Python binding ##------------------------------------ -execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile cqpid.py WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})") install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile cqpid.py @@ -39,12 +42,12 @@ install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile cqpi install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cqpid.py ${CMAKE_CURRENT_BINARY_DIR}/cqpid.pyc ${CMAKE_CURRENT_BINARY_DIR}/cqpid.pyo - DESTINATION ${PYTHON_SITE_PACKAGES} + DESTINATION ${PYTHON_SITEARCH_PACKAGES} COMPONENT ${QPID_COMPONENT_CLIENT} ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/_cqpid_python.so RENAME _cqpid.so - DESTINATION ${PYTHON_SITE_PACKAGES} + DESTINATION ${PYTHON_SITEARCH_PACKAGES} COMPONENT ${QPID_COMPONENT_CLIENT} ) diff --git a/cpp/bindings/qpid/python/Makefile.am b/cpp/bindings/qpid/python/Makefile.am index 432fe7e764..d27cc8b3a2 100644 --- a/cpp/bindings/qpid/python/Makefile.am +++ b/cpp/bindings/qpid/python/Makefile.am @@ -19,7 +19,7 @@ if HAVE_PYTHON_DEVEL -INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src/qmf -I$(top_srcdir)/src -I$(top_builddir)/src +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/bindings -I$(top_builddir)/include -I$(top_srcdir)/src/qmf -I$(top_srcdir)/src -I$(top_builddir)/src generated_file_list = \ cqpid.cpp \ @@ -29,7 +29,7 @@ EXTRA_DIST = CMakeLists.txt python.i BUILT_SOURCES = $(generated_file_list) SWIG_FLAGS = -w362,401 -$(generated_file_list): $(srcdir)/python.i $(srcdir)/../qpid.i $(srcdir)/../../swig_python_typemaps.i +$(generated_file_list): $(srcdir)/python.i $(SWIG) -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -I/usr/include -o cqpid.cpp $(srcdir)/python.i pylibdir = $(pyexecdir) diff --git a/cpp/bindings/qpid/python/python.i b/cpp/bindings/qpid/python/python.i index 4d8a64b376..148cad5e63 100644 --- a/cpp/bindings/qpid/python/python.i +++ b/cpp/bindings/qpid/python/python.i @@ -19,7 +19,7 @@ %module cqpid %include "std_string.i" -%include "../../swig_python_typemaps.i" +%include "qpid/swig_python_typemaps.i" /* Needed for get/setPriority methods. Surprising SWIG 1.3.40 doesn't * convert uint8_t by default. */ @@ -159,7 +159,7 @@ QPID_EXCEPTION(UnauthorizedAccess, SessionError) %rename(_setTtl) qpid::messaging::Message::setTtl; -%include "../qpid.i" +%include "qpid/qpid.i" %extend qpid::messaging::Connection { %pythoncode %{ |