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/ruby | |
| 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/ruby')
| -rw-r--r-- | qpid/cpp/bindings/qmf/ruby/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | qpid/cpp/bindings/qmf/ruby/Makefile.am | 2 | ||||
| -rw-r--r-- | qpid/cpp/bindings/qmf/ruby/ruby.i | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt b/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt index ce853b767b..1fb2542e46 100644 --- a/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt +++ b/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt @@ -22,7 +22,9 @@ ##------------------------------------------------------ set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/ruby.i PROPERTIES CPLUSPLUS ON) -include_directories(${RUBY_INCLUDE_DIRS} ${qpid-cpp_SOURCE_DIR}/include) +include_directories(${RUBY_INCLUDE_DIRS} + ${qpid-cpp_SOURCE_DIR}/include + ${qpid-cpp_SOURCE_DIR}/bindings) swig_add_module(qmfengine_ruby ruby ${CMAKE_CURRENT_SOURCE_DIR}/ruby.i) swig_link_libraries(qmfengine_ruby qmf qmfconsole ${RUBY_LIBRARY}) diff --git a/qpid/cpp/bindings/qmf/ruby/Makefile.am b/qpid/cpp/bindings/qmf/ruby/Makefile.am index 1c7f67edb3..33393aeda0 100644 --- a/qpid/cpp/bindings/qmf/ruby/Makefile.am +++ b/qpid/cpp/bindings/qmf/ruby/Makefile.am @@ -29,7 +29,7 @@ rubylibdir = $(RUBY_LIB) dist_rubylib_DATA = qmf.rb -qmfengine.cpp: $(srcdir)/ruby.i $(srcdir)/../qmfengine.i +qmfengine.cpp: $(srcdir)/ruby.i $(SWIG) -ruby -c++ $(SWIG_FLAGS) $(INCLUDES) $(QPID_CXXFLAGS) -I/usr/include -o qmfengine.cpp $(srcdir)/ruby.i rubylibarchdir = $(RUBY_LIB_ARCH) diff --git a/qpid/cpp/bindings/qmf/ruby/ruby.i b/qpid/cpp/bindings/qmf/ruby/ruby.i index 0101861100..2854aa0c7e 100644 --- a/qpid/cpp/bindings/qmf/ruby/ruby.i +++ b/qpid/cpp/bindings/qmf/ruby/ruby.i @@ -102,5 +102,5 @@ } -%include "../qmfengine.i" +%include "qmf/qmfengine.i" |