From 728c3efbe7b17f4c61c345f68fbaa05328746343 Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Fri, 9 Dec 2011 22:44:40 +0000 Subject: Don't install C++ examples we don't want users basing their learning on any longer. Fixes QPID-3673. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1212672 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/examples/CMakeLists.txt | 7 ++++++- cpp/examples/qmf-console/CMakeLists.txt | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'cpp/examples') diff --git a/cpp/examples/CMakeLists.txt b/cpp/examples/CMakeLists.txt index 1b28cfd031..728ab0e4c6 100644 --- a/cpp/examples/CMakeLists.txt +++ b/cpp/examples/CMakeLists.txt @@ -63,6 +63,11 @@ macro(add_example subdir example) target_link_libraries(${subdir}_${example} qpidclient ${_boost_libs_needed}) endif (${ARGC} GREATER 2) +endmacro(add_example) + +macro(add_installed_example subdir example) + add_example(${subdir} ${example} ${ARGN}) + # For installs, don't install the built example; that would be pointless. # Install the things a user needs to build the example on-site. install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${example}.cpp @@ -74,7 +79,7 @@ macro(add_example subdir example) COMPONENT ${QPID_COMPONENT_EXAMPLES}) endif (MSVC) -endmacro(add_example) +endmacro(add_installed_example) install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.txt DESTINATION ${QPID_INSTALL_EXAMPLESDIR} diff --git a/cpp/examples/qmf-console/CMakeLists.txt b/cpp/examples/qmf-console/CMakeLists.txt index 4bbc7c461f..3b74338221 100644 --- a/cpp/examples/qmf-console/CMakeLists.txt +++ b/cpp/examples/qmf-console/CMakeLists.txt @@ -17,7 +17,7 @@ # under the License. # -add_example(qmf-console console qmfconsole) -add_example(qmf-console printevents qmfconsole) -add_example(qmf-console ping qmfconsole) -add_example(qmf-console queuestats qmfconsole) +add_installed_example(qmf-console console qmfconsole) +add_installed_example(qmf-console printevents qmfconsole) +add_installed_example(qmf-console ping qmfconsole) +add_installed_example(qmf-console queuestats qmfconsole) -- cgit v1.2.1