Author: astitcher
Date: Wed Jun 25 22:30:50 2014
New Revision: 1605624
URL: http://svn.apache.org/r1605624
Log:
PROTON-615: Fix binding dependencies
Added:
qpid/proton/trunk/proton-c/bindings/python/cproton.i
- copied, changed from r1605155,
qpid/proton/trunk/proton-c/bindings/python/python.i
Removed:
qpid/proton/trunk/proton-c/bindings/python/python.i
Modified:
qpid/proton/trunk/proton-c/bindings/perl/CMakeLists.txt
qpid/proton/trunk/proton-c/bindings/php/CMakeLists.txt
qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt
qpid/proton/trunk/proton-c/bindings/ruby/CMakeLists.txt
Modified: qpid/proton/trunk/proton-c/bindings/perl/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/perl/CMakeLists.txt?rev=1605624&r1=1605623&r2=1605624&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/perl/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/bindings/perl/CMakeLists.txt Wed Jun 25 22:30:50
2014
@@ -43,7 +43,9 @@ if (NOT PERL_VENDORARCH_DIR)
endif()
set (CMAKE_C_FLAGS ${PERLCFLAGS})
-
+list(APPEND SWIG_MODULE_cproton_perl_EXTRA_DEPS
+ ${CMAKE_SOURCE_DIR}/proton-c/include/proton/cproton.i
+)
swig_add_module(cproton_perl perl perl.i)
swig_link_libraries(cproton_perl ${BINDING_DEPS} ${PERL_LIBRARY})
Modified: qpid/proton/trunk/proton-c/bindings/php/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/php/CMakeLists.txt?rev=1605624&r1=1605623&r2=1605624&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/php/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/bindings/php/CMakeLists.txt Wed Jun 25 22:30:50
2014
@@ -30,6 +30,9 @@ execute_process(COMMAND ${PHP_CONFIG_EXE
OUTPUT_STRIP_TRAILING_WHITESPACE)
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/php.i PROPERTIES
SWIG_FLAGS "-I${PROJECT_SOURCE_DIR}/include")
+list(APPEND SWIG_MODULE_cproton_EXTRA_DEPS
+ ${CMAKE_SOURCE_DIR}/proton-c/include/proton/cproton.i
+)
swig_add_module(cproton php ${CMAKE_CURRENT_SOURCE_DIR}/php.i)
set_source_files_properties(${swig_generated_file_fullname} PROPERTIES
COMPILE_FLAGS "${PHP_INCLUDES}")
swig_link_libraries(cproton ${BINDING_DEPS})
Modified: qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt?rev=1605624&r1=1605623&r2=1605624&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt Wed Jun 25
22:30:50 2014
@@ -16,15 +16,24 @@
# specific language governing permissions and limitations
# under the License.
#
+
+# NB For python the SWIG module name must have the same name as the input .i
file for CMake to generate the
+# correct dependencies
+
set(CMAKE_SWIG_FLAGS "-threads")
include_directories (${PYTHON_INCLUDE_PATH})
if (BUILD_WITH_CXX)
- SET_SOURCE_FILES_PROPERTIES(python.i PROPERTIES CPLUSPLUS ON)
+ SET_SOURCE_FILES_PROPERTIES(cproton.i PROPERTIES CPLUSPLUS ON)
endif (BUILD_WITH_CXX)
-swig_add_module(cproton python python.i)
+
+list(APPEND SWIG_MODULE_cproton_EXTRA_DEPS
+ ${CMAKE_SOURCE_DIR}/proton-c/include/proton/cproton.i
+)
+
+swig_add_module(cproton python cproton.i)
swig_link_libraries(cproton ${BINDING_DEPS} ${PYTHON_LIBRARIES})
-set_target_properties(_cproton
+set_target_properties(${SWIG_MODULE_cproton_REAL_NAME}
PROPERTIES
LINK_FLAGS "${CATCH_UNDEFINED}")
@@ -74,6 +83,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR
${CMAKE_CURRENT_SOURCE_DIR}/proton.pyo
DESTINATION ${PYTHON_SITEARCH_PACKAGES}
COMPONENT Python)
-install(TARGETS _cproton
+install(TARGETS ${SWIG_MODULE_cproton_REAL_NAME}
DESTINATION ${PYTHON_SITEARCH_PACKAGES}
COMPONENT Python)
Copied: qpid/proton/trunk/proton-c/bindings/python/cproton.i (from r1605155,
qpid/proton/trunk/proton-c/bindings/python/python.i)
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/python/cproton.i?p2=qpid/proton/trunk/proton-c/bindings/python/cproton.i&p1=qpid/proton/trunk/proton-c/bindings/python/python.i&r1=1605155&r2=1605624&rev=1605624&view=diff
==============================================================================
(empty)
Modified: qpid/proton/trunk/proton-c/bindings/ruby/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/ruby/CMakeLists.txt?rev=1605624&r1=1605623&r2=1605624&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/ruby/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/bindings/ruby/CMakeLists.txt Wed Jun 25 22:30:50
2014
@@ -20,7 +20,9 @@
if (NOT DEFAULT_RUBY_TESTING)
message(FATAL_ERROR "Ruby bindings cannot be tested while missing
dependencies")
endif (NOT DEFAULT_RUBY_TESTING)
-
+list(APPEND SWIG_MODULE_cproton-ruby_EXTRA_DEPS
+ ${CMAKE_SOURCE_DIR}/proton-c/include/proton/cproton.i
+)
include_directories (${RUBY_INCLUDE_PATH})
swig_add_module(cproton-ruby ruby ruby.i)
swig_link_libraries(cproton-ruby ${BINDING_DEPS} ${RUBY_LIBRARY})
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
