[mingw-qpid-cpp: 9/28] Convert patch from automake to cmake
Kalev Lember
kalev at fedoraproject.org
Wed Mar 7 17:17:34 UTC 2012
commit 20fb639e32e43f4e980dde891cd71b7c14af81ee
Author: Ted Ross <tross at redhat.com>
Date: Tue Feb 15 22:01:27 2011 -0500
Convert patch from automake to cmake
boost_filesystem_v2.patch | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/boost_filesystem_v2.patch b/boost_filesystem_v2.patch
index a104086..cc26884 100644
--- a/boost_filesystem_v2.patch
+++ b/boost_filesystem_v2.patch
@@ -1,11 +1,13 @@
---- cpp/src/Makefile.am 2010-10-27 14:01:27.000000000 -0400
-+++ cpp/src/Makefile.am 2011-02-07 15:35:30.962680422 -0500
-@@ -122,6 +122,8 @@
- tmoduledir = $(libdir)/qpid/tests
- tmodule_LTLIBRARIES=
+Index: cpp/src/CMakeLists.txt
+===================================================================
+--- cpp/src/CMakeLists.txt (revision 1071113)
++++ cpp/src/CMakeLists.txt (working copy)
+@@ -1213,6 +1213,8 @@
+ # file whereas older builds only have config.h on autoconf-generated builds.
+ add_definitions(-DHAVE_CONFIG_H)
-+AM_CXXFLAGS += -DBOOST_FILESYSTEM_VERSION=2
++add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
+
- ## Automake macros to build libraries and executables.
- qpidd_CXXFLAGS = $(AM_CXXFLAGS) -DQPIDD_MODULE_DIR=\"$(dmoduledir)\" -DQPIDD_CONF_FILE=\"$(sysconfdir)/qpidd.conf\"
- libqpidclient_la_CXXFLAGS = $(AM_CXXFLAGS) -DQPIDC_MODULE_DIR=\"$(cmoduledir)\" -DQPIDC_CONF_FILE=\"$(confdir)/qpidc.conf\"
+ # Now create the config file from all the info learned above.
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/config.h)
More information about the scm-commits
mailing list