You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2013/07/17 12:37:58 UTC
svn commit: r1504071 - /qpid/trunk/qpid/cpp/src/amqp.cmake
Author: gsim
Date: Wed Jul 17 10:37:58 2013
New Revision: 1504071
URL: http://svn.apache.org/r1504071
Log:
NO-JIRA: Enhance proton version compatibility check to restrict latest as well as earliest compatible version
Modified:
qpid/trunk/qpid/cpp/src/amqp.cmake
Modified: qpid/trunk/qpid/cpp/src/amqp.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/amqp.cmake?rev=1504071&r1=1504070&r2=1504071&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/amqp.cmake (original)
+++ qpid/trunk/qpid/cpp/src/amqp.cmake Wed Jul 17 10:37:58 2013
@@ -24,14 +24,19 @@ include(FindPkgConfig)
pkg_check_modules(PROTON libqpid-proton)
set (amqp_default ${amqp_force})
-set (required_version 0.3)
+set (minimum_version 0.3)
+set (maximum_version 0.4)
if (PROTON_FOUND)
- if (PROTON_VERSION LESS ${required_version})
- message(STATUS "Qpid proton is too old, amqp 1.0 support not enabled")
- else (PROTON_VERSION LESS ${required_version})
- message(STATUS "Qpid proton found, amqp 1.0 support enabled")
- set (amqp_default ON)
- endif (PROTON_VERSION LESS ${required_version})
+ if (PROTON_VERSION LESS ${minimum_version})
+ message(STATUS "Qpid proton ${PROTON_VERSION} is too old, require ${minimum_version} - ${maximum_version}; amqp 1.0 support not enabled")
+ else (PROTON_VERSION LESS ${minimum_version})
+ if (PROTON_VERSION GREATER ${maximum_version})
+ message(STATUS "Qpid proton ${PROTON_VERSION} is too new, require ${minimum_version} - ${maximum_version}; amqp 1.0 support not enabled")
+ else (PROTON_VERSION GREATER ${maximum_version})
+ message(STATUS "Qpid proton found, amqp 1.0 support enabled")
+ set (amqp_default ON)
+ endif (PROTON_VERSION GREATER ${maximum_version})
+ endif (PROTON_VERSION LESS ${minimum_version})
else (PROTON_FOUND)
message(STATUS "Qpid proton not found, amqp 1.0 support not enabled")
endif (PROTON_FOUND)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org