diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2011-11-07 20:56:53 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2011-11-07 20:56:53 +0000 |
| commit | ce896aa8ee8d910db26abbe1e15930e8ca8735b4 (patch) | |
| tree | 74711f3dd3114501944db1777ddf7812cc402f01 /cpp/src | |
| parent | 978a2f81313010a34be561cbe12c55fac3ae6cdd (diff) | |
| download | qpid-python-ce896aa8ee8d910db26abbe1e15930e8ca8735b4.tar.gz | |
QPID-3586: Changes for QPID-3464 break cmake build in tar.gz distribution
- Added in the new CMake files to EXTRA_DIST in the Makefile.am files so
that they get built into the tarballs
- Added some cluster test files back into the .../tests/cluster.mk file
as they seem to have been dropped by mistake (and having them missing
also breaks the cmake build in a similar way)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1198929 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Makefile.am | 1 | ||||
| -rw-r--r-- | cpp/src/tests/cluster.mk | 18 |
2 files changed, 11 insertions, 8 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index e87cd3b4e0..1448a8a52f 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -288,6 +288,7 @@ EXTRA_DIST +=\ ssl.cmake \ managementgen.cmake \ rubygen.cmake \ + versions.cmake \ $(rgen_amqp_0_10_srcs) \ qpid/amqp_0_10/apply.h \ qpid/amqp_0_10/built_in_types.h \ diff --git a/cpp/src/tests/cluster.mk b/cpp/src/tests/cluster.mk index 7d17dd7bde..c4216cbd3d 100644 --- a/cpp/src/tests/cluster.mk +++ b/cpp/src/tests/cluster.mk @@ -83,14 +83,16 @@ LONG_TESTS += \ qpidtest_PROGRAMS += cluster_test cluster_test_SOURCES = \ - cluster_test.cpp \ - unit_test.cpp \ - ClusterFixture.cpp \ - ClusterFixture.h \ - ForkedBroker.h \ - ForkedBroker.cpp \ - PartialFailure.cpp \ - ClusterFailover.cpp + cluster_test.cpp \ + unit_test.cpp \ + ClusterFixture.cpp \ + ClusterFixture.h \ + ForkedBroker.h \ + ForkedBroker.cpp \ + PartialFailure.cpp \ + ClusterFailover.cpp \ + InitialStatusMap.cpp \ + StoreStatus.cpp cluster_test_LDADD=$(lib_client) $(lib_broker) ../cluster.la -lboost_unit_test_framework |