diff options
| author | Alan Conway <aconway@apache.org> | 2009-12-02 19:00:11 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-12-02 19:00:11 +0000 |
| commit | 9bd37c771305c1744470bb24f5bf515ce8af5520 (patch) | |
| tree | ebccd7439ee2459aa7fe4f51fd2957dd4ce331fa /cpp/src/cluster.cmake | |
| parent | 260ac89e2ac7596cd4ede19cbfb9c01dc7769827 (diff) | |
| download | qpid-python-9bd37c771305c1744470bb24f5bf515ce8af5520.tar.gz | |
Run cluster tests under cmake.
Various other test fixes.
- Env vars to abstract different library location under cmake/automake.
- More consistent use of env vars test_env.sh in test scripts.
- Fix replication/replicating_exchange mismatch.
- Add --no-module-dir to prevent accidentally loading modules.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@886259 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/cluster.cmake')
| -rw-r--r-- | cpp/src/cluster.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cpp/src/cluster.cmake b/cpp/src/cluster.cmake index c8758a27e4..910d75e768 100644 --- a/cpp/src/cluster.cmake +++ b/cpp/src/cluster.cmake @@ -134,9 +134,12 @@ if (BUILD_CLUSTER) add_library (cluster MODULE ${cluster_SOURCES}) target_link_libraries (cluster ${LIBCPG} ${CMAN_LIB} qpidbroker qpidclient ${Boost_FILESYSTEM_LIBRARY}) - - set_target_properties (cluster PROPERTIES - PREFIX "") + set_target_properties (cluster PROPERTIES PREFIX "") + + # Create a second shared library for linking with test executables, + # cmake will not allow a module to be linked with an executable. + add_library (cluster_shared SHARED ${cluster_SOURCES}) + target_link_libraries (cluster_shared ${LIBCPG} ${CMAN_LIB} qpidbroker qpidclient ${Boost_FILESYSTEM_LIBRARY}) if (CMAKE_COMPILER_IS_GNUCXX) set_target_properties(cluster PROPERTIES |