diff options
| author | Darryl L. Pierce <mcpierce@apache.org> | 2012-11-06 15:51:07 +0000 |
|---|---|---|
| committer | Darryl L. Pierce <mcpierce@apache.org> | 2012-11-06 15:51:07 +0000 |
| commit | 3626c5760389646ba69ebe2f94f77b46578ba2e5 (patch) | |
| tree | 86492656aa47e68ff3e0068ac71f843fd1923517 /qpid/cpp | |
| parent | 63773ea5c91077f703d66d9be8d3c522b15ad091 (diff) | |
| download | qpid-python-3626c5760389646ba69ebe2f94f77b46578ba2e5.tar.gz | |
QPID-4417: Add minimum Swig version check to autotools and Cmake
Any version of Swig < 1.3.32 results in errors in the Perl
language bindings. This change forces both build systems to require at
least version 1.3.32 of Swig in order to build those language bindings.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1406195 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/bindings/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | qpid/cpp/configure.ac | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/qpid/cpp/bindings/CMakeLists.txt b/qpid/cpp/bindings/CMakeLists.txt index 356b0d73a3..7f55377685 100644 --- a/qpid/cpp/bindings/CMakeLists.txt +++ b/qpid/cpp/bindings/CMakeLists.txt @@ -24,7 +24,14 @@ include(FindRuby) include(FindPythonLibs) include(FindPerlLibs) +set (SWIG_MINIMUM_VERSION "1.3.32") + if (SWIG_FOUND) + + if (${SWIG_VERSION} VERSION_LESS ${SWIG_MINIMUM_VERSION}) + message(FATAL_ERROR "Swig >= ${SWIG_MINIMUM_VERSION} required.") + endif() + set(CMAKE_SWIG_FLAGS "-w361,362,401,467,503") if (PYTHONLIBS_FOUND) diff --git a/qpid/cpp/configure.ac b/qpid/cpp/configure.ac index e7e8053f43..29c1ddf1e1 100644 --- a/qpid/cpp/configure.ac +++ b/qpid/cpp/configure.ac @@ -146,7 +146,7 @@ AM_CONDITIONAL([HAS_RPMLINT], [test -n "$RPMLINT"]) AC_CHECK_PROG([RUBY], [ruby], [ruby]) # Swig binding generator is needed for the script (Ruby, Python, etc.) bindings. -AC_PROG_SWIG(1.3.26) +AC_PROG_SWIG(1.3.32) test ! -x "$SWIG" && SWIG="" AC_ARG_WITH([swig], [AS_HELP_STRING([--with-swig], [Use swig to generate qmf bindings.])], |