[qpid-cpp/f16] Install CMake file for C++ messaging examples.
Darryl L. Pierce
mcpierce at fedoraproject.org
Tue Oct 16 11:31:54 UTC 2012
commit 40eb47b678a4138a69f5b3d451c016f82d04fde6
Author: Darryl L. Pierce <dpierce at redhat.com>
Date: Mon Oct 15 13:14:45 2012 -0400
Install CMake file for C++ messaging examples.
- Moved qfm2.pc from qpid-qmf to qpid-qmf-devel
- Resolves: BZ#866892
...nstall-CMake-file-for-C-messaging-example.patch | 103 ++++++++++++++++++++
qpid-cpp.spec | 11 ++-
2 files changed, 112 insertions(+), 2 deletions(-)
---
diff --git a/03-Install-CMake-file-for-C-messaging-example.patch b/03-Install-CMake-file-for-C-messaging-example.patch
new file mode 100644
index 0000000..4dc402d
--- /dev/null
+++ b/03-Install-CMake-file-for-C-messaging-example.patch
@@ -0,0 +1,103 @@
+From 0607005c38053948a82f957a78847df810a3f2e5 Mon Sep 17 00:00:00 2001
+From: "Darryl L. Pierce" <dpierce at redhat.com>
+Date: Mon, 15 Oct 2012 11:47:22 -0400
+Subject: [PATCH] QPID-4372: Install CMake file for C++ messaging examples.
+
+Adds a new CMakeLists.txt file for the messaging examples that allows
+for cross-platform building. Updates the Makefile.am for the examples
+directory to install the new CMake file.
+---
+ qpid/cpp/examples/messaging/Makefile.am | 3 +-
+ .../examples/messaging/extra_dist/CMakeLists.txt | 66 ++++++++++++++++++++++
+ 2 files changed, 68 insertions(+), 1 deletion(-)
+ create mode 100644 qpid/cpp/examples/messaging/extra_dist/CMakeLists.txt
+
+diff --git a/qpid/cpp/examples/messaging/Makefile.am b/qpid/cpp/examples/messaging/Makefile.am
+index 298d65e..3347b37 100644
+--- a/qpid/cpp/examples/messaging/Makefile.am
++++ b/qpid/cpp/examples/messaging/Makefile.am
+@@ -61,7 +61,8 @@ examples_DATA= \
+ server.cpp \
+ map_sender.cpp \
+ map_receiver.cpp \
+- extra_dist/Makefile
++ extra_dist/Makefile \
++ extra_dist/CMakeLists.txt
+
+ EXTRA_DIST= \
+ $(examples_DATA) \
+diff --git a/qpid/cpp/examples/messaging/extra_dist/CMakeLists.txt b/qpid/cpp/examples/messaging/extra_dist/CMakeLists.txt
+new file mode 100644
+index 0000000..4d7800f
+--- /dev/null
++++ b/qpid/cpp/examples/messaging/extra_dist/CMakeLists.txt
+@@ -0,0 +1,66 @@
++#
++# Licensed to the Apache Software Foundation (ASF) under one
++# or more contributor license agreements. See the NOTICE file
++# distributed with this work for additional information
++# regarding copyright ownership. The ASF licenses this file
++# to you under the Apache License, Version 2.0 (the
++# "License"); you may not use this file except in compliance
++# with the License. You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing,
++# software distributed under the License is distributed on an
++# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++# KIND, either express or implied. See the License for the
++# specific language governing permissions and limitations
++# under the License.
++#
++
++project(qpid-cpp-examples)
++cmake_minimum_required(VERSION 2.6.0)
++
++# drain and spout have explicit Boost.program_options usage in them, so be
++# sure that lib is linked in.
++
++macro(add_messaging_example example)
++ add_executable(${example} ${example}.cpp OptionParser.cpp)
++ set_target_properties(${example} PROPERTIES OUTPUT_NAME ${example})
++ target_link_libraries(${example} qpidmessaging qpidtypes ${_boost_libs_needed})
++ # 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 ${CMAKE_CURRENT_SOURCE_DIR}/OptionParser.h ${CMAKE_CURRENT_SOURCE_DIR}/OptionParser.cpp
++ DESTINATION ${QPID_INSTALL_EXAMPLESDIR}/messaging
++ COMPONENT ${QPID_COMPONENT_EXAMPLES})
++ if (MSVC)
++ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/messaging_${example}.vcproj
++ DESTINATION ${QPID_INSTALL_EXAMPLESDIR}/messaging
++ COMPONENT ${QPID_COMPONENT_EXAMPLES})
++ endif (MSVC)
++
++endmacro(add_messaging_example)
++
++add_messaging_example(drain)
++add_messaging_example(spout)
++
++add_messaging_example(map_receiver)
++add_messaging_example(map_sender)
++
++add_messaging_example(client)
++add_messaging_example(server)
++
++# These don't need Boost or OptionParser
++add_executable(hello_world hello_world.cpp)
++set_target_properties(hello_world PROPERTIES OUTPUT_NAME hello_world)
++target_link_libraries(hello_world qpidmessaging)
++install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/hello_world.cpp
++ DESTINATION ${QPID_INSTALL_EXAMPLESDIR}/messaging
++ COMPONENT ${QPID_COMPONENT_EXAMPLES})
++
++add_executable(hello_xml hello_xml.cpp)
++set_target_properties(hello_xml PROPERTIES OUTPUT_NAME hello_xml)
++target_link_libraries(hello_xml qpidmessaging)
++install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/hello_xml.cpp
++ DESTINATION ${QPID_INSTALL_EXAMPLESDIR}/messaging
++ COMPONENT ${QPID_COMPONENT_EXAMPLES})
++
+--
+1.7.11.7
+
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index 1a6a474..cff8d56 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -28,7 +28,7 @@
Name: qpid-cpp
Version: 0.18
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Libraries for Qpid C++ client applications
License: ASL 2.0
URL: http://qpid.apache.org
@@ -66,6 +66,7 @@ BuildRequires: libaio-devel
Patch1: 01-Relocated-all-swig-.i-files-to-the-include-directory.patch
Patch2: 02-Fix-building-of-messaging-examples-after-installatio.patch
+Patch3: 03-Install-CMake-file-for-C-messaging-example.patch
%description
@@ -286,7 +287,6 @@ An extensible management framework layered on QPID messaging.
%{_libdir}/libqmf2.so.*
%{_libdir}/libqmfengine.so.*
%{_libdir}/libqmfconsole.so.*
-%{_libdir}/pkgconfig/qmf2.pc
%post -n qpid-qmf -p /sbin/ldconfig
@@ -317,6 +317,7 @@ components.
%{_includedir}/qmf2.i
%{_bindir}/qmf-gen
%{python_sitelib}/qmfgen
+%{_libdir}/pkgconfig/qmf2.pc
%post -n qpid-qmf-devel -p /sbin/ldconfig
@@ -563,6 +564,7 @@ Management and diagnostic tools for Apache Qpid brokers and clients.
%patch1 -p2
%patch2 -p2
+%patch3 -p2
%global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
@@ -745,6 +747,11 @@ rm -rf %{buildroot}
%changelog
+* Tue Oct 16 2012 Darryl L. Pierce <dpierce at redhat.com> - 0.18-4
+- Install CMake file for C++ messaging examples.
+- Moved qfm2.pc from qpid-qmf to qpid-qmf-devel
+- Resolves: BZ#866892
+
* Fri Oct 12 2012 Darryl L. Pierce <dpierce at redhat.com> - 0.18-3
- Fixed building C++ messaging examples.
- Fixed ownership for /usr/share/qpidc and /usr/shar/qpidc/messaging
More information about the scm-commits
mailing list