diff options
| author | Alan Conway <aconway@apache.org> | 2009-11-30 19:34:36 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-11-30 19:34:36 +0000 |
| commit | 6bb0134ca322b6e50e6ec76a242f89259cd12274 (patch) | |
| tree | 74ab33d008364a6b72fd879a0ad99693c42da33c /qpid/cpp/src/CMakeLists.txt | |
| parent | f4b13c8d16754f29a331fe7ec2c7e1bc7995c524 (diff) | |
| download | qpid-python-6bb0134ca322b6e50e6ec76a242f89259cd12274.tar.gz | |
Clean up test environment variables, prepare for running more tests in cmake.
- consolidate test env vars in test_env.sh, also useful from command line.
- generate test_env.sh with autoconf/cmake to cover library location differences.
- Remove explicit mention of .libs, use $QPID_MODULE_DIR to load modules.
- Fix run_test to run valgrind under cmake
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@885557 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/CMakeLists.txt')
| -rw-r--r-- | qpid/cpp/src/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index 907dc0e71e..dc084662dd 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/cpp/src/CMakeLists.txt @@ -324,6 +324,7 @@ if (BUILD_XML) qpid/xml/XmlExchange.cpp qpid/xml/XmlExchange.h qpid/xml/XmlExchangePlugin.cpp) + set_target_properties (xml PROPERTIES PREFIX "") target_link_libraries (xml xerces-c xqilla qpidbroker pthread) if (CMAKE_COMPILER_IS_GNUCXX) set_target_properties (xml PROPERTIES @@ -356,6 +357,7 @@ if (BUILD_ACL) qpid/acl/AclReader.h ) add_library (acl MODULE ${acl_SOURCES}) + set_target_properties (acl PROPERTIES PREFIX "") target_link_libraries (acl qpidbroker ${Boost_PROGRAM_OPTIONS_LIBRARY}) if (CMAKE_COMPILER_IS_GNUCXX) set_target_properties (acl PROPERTIES @@ -873,8 +875,7 @@ add_library (replicating_listener MODULE qpid/replication/ReplicatingEventListener.h ) target_link_libraries (replicating_listener qpidbroker ${Boost_PROGRAM_OPTIONS_LIBRARY}) -set_target_properties (replicating_listener PROPERTIES - PREFIX "") +set_target_properties (replicating_listener PROPERTIES PREFIX "") if (CMAKE_COMPILER_IS_GNUCXX) set_target_properties(replicating_listener PROPERTIES LINK_FLAGS -Wl,--no-undefined) @@ -893,8 +894,7 @@ add_library (replicating_exchange MODULE qpid/replication/ReplicationExchange.h ) target_link_libraries (replicating_exchange qpidbroker) -set_target_properties (replicating_exchange PROPERTIES - PREFIX "") +set_target_properties (replicating_exchange PROPERTIES PREFIX "") if (CMAKE_COMPILER_IS_GNUCXX) set_target_properties(replicating_exchange PROPERTIES LINK_FLAGS -Wl,--no-undefined) |