You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by mc...@apache.org on 2012/11/13 19:20:26 UTC
svn commit: r1408867 - /qpid/trunk/qpid/cpp/bindings/CMakeLists.txt
Author: mcpierce
Date: Tue Nov 13 18:20:25 2012
New Revision: 1408867
URL: http://svn.apache.org/viewvc?rev=1408867&view=rev
Log:
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.
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=1408867&r1=1408866&r2=1408867&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/bindings/CMakeLists.txt Tue Nov 13 18:20:25 2012
@@ -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)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org