diff options
| author | Darryl L. Pierce <mcpierce@apache.org> | 2012-11-27 18:07:49 +0000 |
|---|---|---|
| committer | Darryl L. Pierce <mcpierce@apache.org> | 2012-11-27 18:07:49 +0000 |
| commit | 29b1a1b8af1348c1334d5636028903c6e6725a34 (patch) | |
| tree | d777e622b14815587dff461923357e7b521fc90d /qpid/cpp/bindings/qmf/python | |
| parent | 6954daaed0c0f18b0e4897c6b8acb077eee51df1 (diff) | |
| download | qpid-python-29b1a1b8af1348c1334d5636028903c6e6725a34.tar.gz | |
QPID-4207 : Relocated all swig .i files to the include directory.
Updated the build systems to use the new locations. Updated all other .i
files to not use relative paths when referencing them.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1414294 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/bindings/qmf/python')
| -rw-r--r-- | qpid/cpp/bindings/qmf/python/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | qpid/cpp/bindings/qmf/python/Makefile.am | 2 | ||||
| -rw-r--r-- | qpid/cpp/bindings/qmf/python/python.i | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/qpid/cpp/bindings/qmf/python/CMakeLists.txt b/qpid/cpp/bindings/qmf/python/CMakeLists.txt index adeb1db78a..1768df7f85 100644 --- a/qpid/cpp/bindings/qmf/python/CMakeLists.txt +++ b/qpid/cpp/bindings/qmf/python/CMakeLists.txt @@ -21,7 +21,7 @@ ## 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(qmfengine_python python ${CMAKE_CURRENT_SOURCE_DIR}/python.i) swig_link_libraries(qmfengine_python qmf qmfconsole ${PYTHON_LIBRARIES}) diff --git a/qpid/cpp/bindings/qmf/python/Makefile.am b/qpid/cpp/bindings/qmf/python/Makefile.am index bcef8c6b53..07f3c1072b 100644 --- a/qpid/cpp/bindings/qmf/python/Makefile.am +++ b/qpid/cpp/bindings/qmf/python/Makefile.am @@ -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)/../qmfengine.i +$(generated_file_list): $(srcdir)/python.i $(SWIG) -c++ -python $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I$(top_srcdir)/src/qmf -I/usr/include -o qmfengine.cpp $(srcdir)/python.i pylibdir = $(pyexecdir) diff --git a/qpid/cpp/bindings/qmf/python/python.i b/qpid/cpp/bindings/qmf/python/python.i index 5e25d155f9..118d0d3dbd 100644 --- a/qpid/cpp/bindings/qmf/python/python.i +++ b/qpid/cpp/bindings/qmf/python/python.i @@ -139,5 +139,5 @@ -%include "../qmfengine.i" +%include "qmf/qmfengine.i" |