You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by sh...@apache.org on 2014/04/02 17:16:08 UTC
svn commit: r1584066 -
/qpid/branches/0.28/qpid/cpp/CMakeModules/FindProton.cmake
Author: shuston
Date: Wed Apr 2 15:16:08 2014
New Revision: 1584066
URL: http://svn.apache.org/r1584066
Log:
Merge QPID-5646 fix r1584055 to 0.28
Modified:
qpid/branches/0.28/qpid/cpp/CMakeModules/FindProton.cmake (contents, props changed)
Modified: qpid/branches/0.28/qpid/cpp/CMakeModules/FindProton.cmake
URL: http://svn.apache.org/viewvc/qpid/branches/0.28/qpid/cpp/CMakeModules/FindProton.cmake?rev=1584066&r1=1584065&r2=1584066&view=diff
==============================================================================
--- qpid/branches/0.28/qpid/cpp/CMakeModules/FindProton.cmake (original)
+++ qpid/branches/0.28/qpid/cpp/CMakeModules/FindProton.cmake Wed Apr 2 15:16:08 2014
@@ -65,6 +65,6 @@ if (PKG_CONFIG_FOUND)
endif()
# Proton not found print a standard error message
-if (NOT ${CMAKE_VERSION} VERSION_LESS "2.8.0")
+if (NOT ${CMAKE_VERSION} VERSION_LESS "2.8.3")
find_package_handle_standard_args(Proton CONFIG_MODE)
endif()
Propchange: qpid/branches/0.28/qpid/cpp/CMakeModules/FindProton.cmake
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 2 15:16:08 2014
@@ -0,0 +1,8 @@
+/qpid/branches/0.5.x-dev/qpid/cpp/CMakeModules/FindProton.cmake:892761,894875
+/qpid/branches/0.6-release-windows-installer/cpp/CMakeModules/FindProton.cmake:926803
+/qpid/branches/0.6-release-windows-installer/qpid/cpp/CMakeModules/FindProton.cmake:926803,927233
+/qpid/branches/java-network-refactor/qpid/cpp/CMakeModules/FindProton.cmake:805429-825319
+/qpid/branches/mcpierce-QPID-4719/qpid/cpp/CMakeModules/FindProton.cmake:1477004-1477093
+/qpid/branches/qpid-2935/qpid/cpp/CMakeModules/FindProton.cmake:1061302-1072333
+/qpid/branches/qpid-3346/qpid/cpp/CMakeModules/FindProton.cmake:1144319-1179855
+/qpid/trunk/qpid/cpp/CMakeModules/FindProton.cmake:1579926,1580559-1580560,1584055
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org