Author: astitcher
Date: Thu Jul 5 21:41:52 2012
New Revision: 1357945
URL: http://svn.apache.org/viewvc?rev=1357945&view=rev
Log:
QPID-4101: Fixes building the Ruby language bindings for Ruby 1.9
Applied lightly modified patch from Darryl Pierce
Modified:
qpid/trunk/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt
qpid/trunk/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt
qpid/trunk/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt?rev=1357945&r1=1357944&r2=1357945&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt Thu Jul 5 21:41:52
2012
@@ -21,13 +21,12 @@
## Use Swig to generate a literal binding to the C++ API
##------------------------------------------------------
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/ruby.i PROPERTIES
CPLUSPLUS ON)
-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/ruby.i PROPERTIES
SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include")
+
+include_directories(${RUBY_INCLUDE_DIRS} ${qpid-cpp_SOURCE_DIR}/include)
swig_add_module(qmfengine_ruby ruby ${CMAKE_CURRENT_SOURCE_DIR}/ruby.i)
swig_link_libraries(qmfengine_ruby qmf qmfconsole ${RUBY_LIBRARY})
-set_source_files_properties(${swig_generated_file_fullname} PROPERTIES
COMPILE_FLAGS "-I${RUBY_INCLUDE_DIR} -I${qpid-cpp_SOURCE_DIR}/include")
-
##----------------------------------
## Install the complete Ruby binding
##----------------------------------
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt?rev=1357945&r1=1357944&r2=1357945&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt Thu Jul 5 21:41:52
2012
@@ -21,13 +21,12 @@
## Use Swig to generate a literal binding to the C++ API
##------------------------------------------------------
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/ruby.i PROPERTIES
CPLUSPLUS ON)
-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/ruby.i PROPERTIES
SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include")
+
+include_directories(${RUBY_INCLUDE_DIRS} ${qpid-cpp_SOURCE_DIR}/include)
swig_add_module(cqmf2_ruby ruby ${CMAKE_CURRENT_SOURCE_DIR}/ruby.i)
swig_link_libraries(cqmf2_ruby qmf2 ${RUBY_LIBRARY})
-set_source_files_properties(${swig_generated_file_fullname} PROPERTIES
COMPILE_FLAGS "-I${RUBY_INCLUDE_DIR} -I${qpid-cpp_SOURCE_DIR}/include")
-
##----------------------------------
## Install the complete Ruby binding
##----------------------------------
Modified: qpid/trunk/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt?rev=1357945&r1=1357944&r2=1357945&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt Thu Jul 5 21:41:52
2012
@@ -30,12 +30,13 @@ set(GEM_OUTPUT_FILE ${GEM_OUTPUT_PATH}/p
## Use Swig to generate a literal binding to the C++ API
##------------------------------------------------------
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/ruby.i PROPERTIES
CPLUSPLUS ON)
-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/ruby.i PROPERTIES
SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include")
+
+include_directories(${RUBY_INCLUDE_DIRS} ${qpid-cpp_SOURCE_DIR}/include)
swig_add_module(cqpid_ruby ruby ${CMAKE_CURRENT_SOURCE_DIR}/ruby.i)
swig_link_libraries(cqpid_ruby qpidmessaging qpidtypes qmf2 ${RUBY_LIBRARY})
-set_source_files_properties(${swig_generated_file_fullname} PROPERTIES
COMPILE_FLAGS "-fno-strict-aliasing -I${RUBY_INCLUDE_DIR}
-I${qpid-cpp_SOURCE_DIR}/include")
+set_source_files_properties(${swig_generated_file_fullname} PROPERTIES
COMPILE_FLAGS "-fno-strict-aliasing")
##----------------------------------
## Install the complete Ruby binding
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
