From 20e4d2144cef80dd431233904f7ab3670e995603 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Wed, 14 Nov 2012 16:06:00 +0000 Subject: Fix QPID-4434 - Skip language bindings if Swig is too old. So that it works if swig isn't found at all. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1409244 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/bindings/CMakeLists.txt | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'cpp') diff --git a/cpp/bindings/CMakeLists.txt b/cpp/bindings/CMakeLists.txt index 83715fb940..3d44ef01cd 100644 --- a/cpp/bindings/CMakeLists.txt +++ b/cpp/bindings/CMakeLists.txt @@ -26,15 +26,10 @@ include(FindPerlLibs) set (SWIG_MINIMUM_VERSION "1.3.32") -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_FOUND AND SWIG_SUFFICIENT_VERSION) - +if (SWIG_FOUND) + if (${SWIG_VERSION} VERSION_LESS ${SWIG_MINIMUM_VERSION}) + message("Found Swig < ${SWIG_MINIMUM_VERSION} - skipping language bindings") + else() set(CMAKE_SWIG_FLAGS "-w361,362,401,467,503") if (PYTHONLIBS_FOUND) @@ -68,4 +63,5 @@ if (SWIG_FOUND AND SWIG_SUFFICIENT_VERSION) add_subdirectory(qpid/perl) endif (PERLLIBS_FOUND) -endif (SWIG_FOUND AND SWIG_SUFFICIENT_VERSION) + endif (${SWIG_VERSION} VERSION_LESS ${SWIG_MINIMUM_VERSION}) +endif (SWIG_FOUND) -- cgit v1.2.1