Author: astitcher
Date: Wed Nov 14 16:06:00 2012
New Revision: 1409244
URL: http://svn.apache.org/viewvc?rev=1409244&view=rev
Log:
Fix QPID-4434 - Skip language bindings if Swig is too old.
So that it works if swig isn't found at all.
Modified:
qpid/trunk/qpid/cpp/bindings/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/bindings/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/CMakeLists.txt?rev=1409244&r1=1409243&r2=1409244&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/CMakeLists.txt Wed Nov 14 16:06:00 2012
@@ -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_VERSI
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)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
