From d233f5d3115c719a7ddf7134da1329d9c092d673 Mon Sep 17 00:00:00 2001 From: "Darryl L. Pierce" Date: Tue, 13 Nov 2012 18:20:25 +0000 Subject: QPID-4434 - Skip language bindings if Swig is too old. Previously the CMake environment would fail if the version of Swig found was too old. Now it will skip the language bindings and notify the user of that choice. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1408867 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/bindings/CMakeLists.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'cpp/bindings') diff --git a/cpp/bindings/CMakeLists.txt b/cpp/bindings/CMakeLists.txt index 7f55377685..83715fb940 100644 --- a/cpp/bindings/CMakeLists.txt +++ b/cpp/bindings/CMakeLists.txt @@ -26,11 +26,14 @@ include(FindPerlLibs) set (SWIG_MINIMUM_VERSION "1.3.32") -if (SWIG_FOUND) +if (${SWIG_VERSION} VERSION_LESS ${SWIG_MINIMUM_VERSION}) + message("Found Swig < ${SWIG_MINIMUM_VERSION} - skipping language bindings") + set(SWIG_SUFFICIENT_VERSION FALSE) +else() + set(SWIG_SUFFICIENT_VERSION TRUE) +endif() - if (${SWIG_VERSION} VERSION_LESS ${SWIG_MINIMUM_VERSION}) - message(FATAL_ERROR "Swig >= ${SWIG_MINIMUM_VERSION} required.") - endif() +if (SWIG_FOUND AND SWIG_SUFFICIENT_VERSION) set(CMAKE_SWIG_FLAGS "-w361,362,401,467,503") @@ -65,4 +68,4 @@ if (SWIG_FOUND) add_subdirectory(qpid/perl) endif (PERLLIBS_FOUND) -endif (SWIG_FOUND) +endif (SWIG_FOUND AND SWIG_SUFFICIENT_VERSION) -- cgit v1.2.1