diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2012-11-14 16:06:00 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2012-11-14 16:06:00 +0000 |
| commit | 75860d6cf80b5663390d94433f689ee5e899a902 (patch) | |
| tree | 838df275ebac3f10769747988517f72e2c60e6fa /qpid/cpp | |
| parent | e89ee3715fe9b7b52177426332904acd05647034 (diff) | |
| download | qpid-python-75860d6cf80b5663390d94433f689ee5e899a902.tar.gz | |
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@1409244 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/bindings/CMakeLists.txt | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/qpid/cpp/bindings/CMakeLists.txt b/qpid/cpp/bindings/CMakeLists.txt index 83715fb940..3d44ef01cd 100644 --- a/qpid/cpp/bindings/CMakeLists.txt +++ b/qpid/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) |