Author: mcpierce
Date: Tue Nov 6 15:51:07 2012
New Revision: 1406195
URL: http://svn.apache.org/viewvc?rev=1406195&view=rev
Log:
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.
Modified:
qpid/trunk/qpid/cpp/bindings/CMakeLists.txt
qpid/trunk/qpid/cpp/configure.ac
Modified: qpid/trunk/qpid/cpp/bindings/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/CMakeLists.txt?rev=1406195&r1=1406194&r2=1406195&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/CMakeLists.txt Tue Nov 6 15:51:07 2012
@@ -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)
Modified: qpid/trunk/qpid/cpp/configure.ac
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/configure.ac?rev=1406195&r1=1406194&r2=1406195&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/configure.ac (original)
+++ qpid/trunk/qpid/cpp/configure.ac Tue Nov 6 15:51:07 2012
@@ -146,7 +146,7 @@ AM_CONDITIONAL([HAS_RPMLINT], [test -n "
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.])],
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
