Author: shuston
Date: Mon Mar 7 16:23:25 2011
New Revision: 1078833
URL: http://svn.apache.org/viewvc?rev=1078833&view=rev
Log:
Merge change from QPID-3118 from trunk to 0.10 branch. Ok per Justin Ross
3/4/2011
Modified:
qpid/branches/0.10/qpid/cpp/examples/ (props changed)
qpid/branches/0.10/qpid/cpp/examples/CMakeLists.txt
Propchange: qpid/branches/0.10/qpid/cpp/examples/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Mar 7 16:23:25 2011
@@ -0,0 +1,6 @@
+/qpid/branches/0.5.x-dev/qpid/cpp/examples:892761,894875
+/qpid/branches/0.6-release-windows-installer/cpp/examples:926803
+/qpid/branches/0.6-release-windows-installer/qpid/cpp/examples:926803,927233
+/qpid/branches/java-network-refactor/qpid/cpp/examples:805429-825319
+/qpid/branches/qpid-2935/qpid/cpp/examples:1061302-1072333
+/qpid/trunk/qpid/cpp/examples:1078099
Modified: qpid/branches/0.10/qpid/cpp/examples/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/cpp/examples/CMakeLists.txt?rev=1078833&r1=1078832&r2=1078833&view=diff
==============================================================================
--- qpid/branches/0.10/qpid/cpp/examples/CMakeLists.txt (original)
+++ qpid/branches/0.10/qpid/cpp/examples/CMakeLists.txt Mon Mar 7 16:23:25 2011
@@ -77,14 +77,10 @@ macro(add_example subdir example)
endmacro(add_example)
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.txt
- ${CMAKE_CURRENT_SOURCE_DIR}/README.verify
- ${CMAKE_CURRENT_SOURCE_DIR}/verify
- ${CMAKE_CURRENT_SOURCE_DIR}/verify_all
DESTINATION ${QPID_INSTALL_EXAMPLESDIR}
COMPONENT ${QPID_COMPONENT_EXAMPLES})
if (MSVC)
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples.sln
- ${CMAKE_CURRENT_SOURCE_DIR}/old-examples.sln
DESTINATION ${QPID_INSTALL_EXAMPLESDIR}
COMPONENT ${QPID_COMPONENT_EXAMPLES})
endif (MSVC)
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
