Repository: qpid-proton Updated Branches: refs/heads/master c6d1c8a7a -> bbc04608b
NO-JIRA: Add proton header files to swig generator dependencies. Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/bbc04608 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/bbc04608 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/bbc04608 Branch: refs/heads/master Commit: bbc04608b7d80b343ea05087905691355f8d49c8 Parents: c6d1c8a Author: Alan Conway <acon...@redhat.com> Authored: Mon Feb 23 17:41:14 2015 -0500 Committer: Alan Conway <acon...@redhat.com> Committed: Mon Feb 23 17:46:52 2015 -0500 ---------------------------------------------------------------------- proton-c/bindings/CMakeLists.txt | 3 +++ proton-c/bindings/node/CMakeLists.txt | 1 + proton-c/bindings/perl/CMakeLists.txt | 1 + proton-c/bindings/php/CMakeLists.txt | 1 + proton-c/bindings/python/CMakeLists.txt | 1 + proton-c/bindings/ruby/CMakeLists.txt | 1 + 6 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bbc04608/proton-c/bindings/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/proton-c/bindings/CMakeLists.txt b/proton-c/bindings/CMakeLists.txt index d7f1e4b..06609e2 100644 --- a/proton-c/bindings/CMakeLists.txt +++ b/proton-c/bindings/CMakeLists.txt @@ -22,6 +22,9 @@ include(UseSWIG) # Add any new bindings here - the directory name must be the same as the binding name set (BINDINGS python ruby php perl javascript) +# All swig modules should include ${PROTON_HEADERS} in SWIG_MODULE_<name>_EXTRA_DEPS +file(GLOB PROTON_HEADERS "${CMAKE_SOURCE_DIR}/proton-c/include/proton/*.h") + # If swig version is 3.0 or greater then we can build some additional bindings if (${SWIG_VERSION} VERSION_GREATER 3.0 OR ${SWIG_VERSION} VERSION_EQUAL 3.0) set (BINDINGS http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bbc04608/proton-c/bindings/node/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/proton-c/bindings/node/CMakeLists.txt b/proton-c/bindings/node/CMakeLists.txt index 1a02109..3bea9f7 100644 --- a/proton-c/bindings/node/CMakeLists.txt +++ b/proton-c/bindings/node/CMakeLists.txt @@ -61,6 +61,7 @@ swig_add_module(cproton javascript javascript.i) set_target_properties (cproton PROPERTIES LINKER_LANGUAGE CXX) list(APPEND SWIG_MODULE_cproton_javascript_EXTRA_DEPS ${CMAKE_CURRENT_SOURCE_DIR}/../../proton-c/include/proton/cproton.i + ${PROTON_HEADERS} ) set_target_properties (cproton PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -DBUILDING_NODE_EXTENSION" http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bbc04608/proton-c/bindings/perl/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/proton-c/bindings/perl/CMakeLists.txt b/proton-c/bindings/perl/CMakeLists.txt index aedd6f1..9891c09 100644 --- a/proton-c/bindings/perl/CMakeLists.txt +++ b/proton-c/bindings/perl/CMakeLists.txt @@ -49,6 +49,7 @@ endif() set (CMAKE_C_FLAGS ${PERLCFLAGS}) list(APPEND SWIG_MODULE_cproton_perl_EXTRA_DEPS ${CMAKE_SOURCE_DIR}/proton-c/include/proton/cproton.i + ${PROTON_HEADERS} ) swig_add_module(cproton_perl perl perl.i) swig_link_libraries(cproton_perl ${BINDING_DEPS} ${PERL_LIBRARY}) http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bbc04608/proton-c/bindings/php/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/proton-c/bindings/php/CMakeLists.txt b/proton-c/bindings/php/CMakeLists.txt index 637f692..558269d 100644 --- a/proton-c/bindings/php/CMakeLists.txt +++ b/proton-c/bindings/php/CMakeLists.txt @@ -32,6 +32,7 @@ execute_process(COMMAND ${PHP_CONFIG_EXE} --includes 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 + ${PROTON_HEADERS} ) swig_add_module(cproton php ${CMAKE_CURRENT_SOURCE_DIR}/php.i) set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "${PHP_INCLUDES}") http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bbc04608/proton-c/bindings/python/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/proton-c/bindings/python/CMakeLists.txt b/proton-c/bindings/python/CMakeLists.txt index 70ac847..7f54033 100644 --- a/proton-c/bindings/python/CMakeLists.txt +++ b/proton-c/bindings/python/CMakeLists.txt @@ -29,6 +29,7 @@ endif (BUILD_WITH_CXX) list(APPEND SWIG_MODULE_cproton_EXTRA_DEPS ${CMAKE_SOURCE_DIR}/proton-c/include/proton/cproton.i + ${PROTON_HEADERS} ) swig_add_module(cproton python cproton.i) http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bbc04608/proton-c/bindings/ruby/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/proton-c/bindings/ruby/CMakeLists.txt b/proton-c/bindings/ruby/CMakeLists.txt index ee7f955..e42db32 100644 --- a/proton-c/bindings/ruby/CMakeLists.txt +++ b/proton-c/bindings/ruby/CMakeLists.txt @@ -22,6 +22,7 @@ if (NOT DEFAULT_RUBY_TESTING) endif (NOT DEFAULT_RUBY_TESTING) list(APPEND SWIG_MODULE_cproton-ruby_EXTRA_DEPS ${CMAKE_SOURCE_DIR}/proton-c/include/proton/cproton.i + ${PROTON_HEADERS} ) include_directories (${RUBY_INCLUDE_PATH}) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
