qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject svn commit: r1463180 - in /qpid/branches/0.22/qpid: ./ cpp/src/ cpp/src/amqp.cmake
Date Mon, 01 Apr 2013 16:11:04 GMT
Author: gsim
Date: Mon Apr  1 16:11:03 2013
New Revision: 1463180

URL: http://svn.apache.org/r1463180
Log:
QPID-4669: have cmake build require proton 0.3 or greater. Merged from r1462214.

Modified:
    qpid/branches/0.22/qpid/   (props changed)
    qpid/branches/0.22/qpid/cpp/src/   (props changed)
    qpid/branches/0.22/qpid/cpp/src/amqp.cmake

Propchange: qpid/branches/0.22/qpid/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid:r1462214

Propchange: qpid/branches/0.22/qpid/cpp/src/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/cpp/src:r1462214

Modified: qpid/branches/0.22/qpid/cpp/src/amqp.cmake
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/cpp/src/amqp.cmake?rev=1463180&r1=1463179&r2=1463180&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/cpp/src/amqp.cmake (original)
+++ qpid/branches/0.22/qpid/cpp/src/amqp.cmake Mon Apr  1 16:11:03 2013
@@ -24,9 +24,14 @@ include(FindPkgConfig)
 pkg_check_modules(PROTON libqpid-proton)
 
 set (amqp_default ${amqp_force})
+set (required_version 0.3)
 if (PROTON_FOUND)
-    message(STATUS "Qpid proton found, amqp 1.0 support enabled")
-    set (amqp_default ON)
+    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})
 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


Mime
View raw message