diff options
| author | Darryl L. Pierce <mcpierce@apache.org> | 2012-11-13 18:20:25 +0000 |
|---|---|---|
| committer | Darryl L. Pierce <mcpierce@apache.org> | 2012-11-13 18:20:25 +0000 |
| commit | 67ffcc19fb2e0e5f2afdac8686822b62a7c2ed1c (patch) | |
| tree | 73825e01cd5e7d8a58c262d4effb3a80cfb25a2b /qpid/cpp | |
| parent | da271863672f69f065d6545a617dd52db5063452 (diff) | |
| download | qpid-python-67ffcc19fb2e0e5f2afdac8686822b62a7c2ed1c.tar.gz | |
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@1408867 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/bindings/CMakeLists.txt | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/qpid/cpp/bindings/CMakeLists.txt b/qpid/cpp/bindings/CMakeLists.txt index 7f55377685..83715fb940 100644 --- a/qpid/cpp/bindings/CMakeLists.txt +++ b/qpid/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) |