Author: astitcher
Date: Tue Jan 14 21:11:29 2014
New Revision: 1558193
URL: http://svn.apache.org/r1558193
Log:
QPID-5452: Change installation directory for qpid-send/qpid-receive
qpid-send/qpid/receive are useful utilities in their own right and
not just used for testing so install them in an easily accessible
location.
Patch from Irina Boverman
Modified:
qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt?rev=1558193&r1=1558192&r2=1558193&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt Tue Jan 14 21:11:29 2014
@@ -60,6 +60,18 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows)
endif (CMAKE_SYSTEM_NAME STREQUAL Windows)
# Some generally useful utilities that just happen to be built in the test area
+add_executable (qpid-receive qpid-receive.cpp Statistics.cpp
${platform_test_additions})
+target_link_libraries (qpid-receive qpidmessaging qpidtypes qpidcommon
"${Boost_PROGRAM_OPTIONS_LIBRARY}")
+remember_location(qpid-receive)
+
+add_executable (qpid-send qpid-send.cpp Statistics.cpp
${platform_test_additions})
+target_link_libraries (qpid-send qpidmessaging qpidtypes qpidcommon
"${Boost_PROGRAM_OPTIONS_LIBRARY}")
+remember_location(qpid-send)
+
+install (TARGETS
+ qpid-receive qpid-send
+ RUNTIME DESTINATION ${QPID_INSTALL_BINDIR})
+
add_executable (qpid-perftest qpid-perftest.cpp ${platform_test_additions})
target_link_libraries (qpid-perftest qpidclient qpidcommon
"${Boost_PROGRAM_OPTIONS_LIBRARY}")
remember_location(qpid-perftest)
@@ -76,14 +88,6 @@ add_executable (qpid-ping qpid-ping.cpp
target_link_libraries (qpid-ping qpidclient qpidcommon
"${Boost_PROGRAM_OPTIONS_LIBRARY}")
remember_location(qpid-ping)
-add_executable (qpid-receive qpid-receive.cpp Statistics.cpp
${platform_test_additions})
-target_link_libraries (qpid-receive qpidmessaging qpidtypes qpidcommon
"${Boost_PROGRAM_OPTIONS_LIBRARY}")
-remember_location(qpid-receive)
-
-add_executable (qpid-send qpid-send.cpp Statistics.cpp
${platform_test_additions})
-target_link_libraries (qpid-send qpidmessaging qpidtypes qpidcommon
"${Boost_PROGRAM_OPTIONS_LIBRARY}")
-remember_location(qpid-send)
-
add_executable (qpid-topic-listener qpid-topic-listener.cpp
${platform_test_additions})
target_link_libraries (qpid-topic-listener qpidclient qpidcommon
"${Boost_PROGRAM_OPTIONS_LIBRARY}")
remember_location(qpid-topic-listener)
@@ -109,7 +113,7 @@ remember_location(qpid-txtest)
install (TARGETS
qpid-perftest qpid-latency-test qpid-client-test
qpid-ping
- qpid-receive qpid-send qpid-topic-listener qpid-topic-publisher
receiver sender
+ qpid-topic-listener qpid-topic-publisher receiver sender
qpid-txtest
RUNTIME DESTINATION ${QPID_INSTALL_TESTDIR})
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]