summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests
diff options
context:
space:
mode:
authorStephen D. Huston <shuston@apache.org>2012-03-30 20:12:17 +0000
committerStephen D. Huston <shuston@apache.org>2012-03-30 20:12:17 +0000
commit95b45597d87a700095299a0772f7e4379ca00034 (patch)
treed759651c11246232a68ab94130b9b87a326a2296 /qpid/cpp/src/tests
parente54ef8dc737196343ad974c91a86681efca5fb14 (diff)
downloadqpid-python-95b45597d87a700095299a0772f7e4379ca00034.tar.gz
Set BOOST_TEST_DYN_LINK only if linking dynamically with Boost. NO-JIRA
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1307592 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
-rw-r--r--qpid/cpp/src/tests/CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/qpid/cpp/src/tests/CMakeLists.txt b/qpid/cpp/src/tests/CMakeLists.txt
index bb4f52d319..5979ce42ae 100644
--- a/qpid/cpp/src/tests/CMakeLists.txt
+++ b/qpid/cpp/src/tests/CMakeLists.txt
@@ -23,7 +23,11 @@ include (CTest)
# Make sure that everything get built before the tests
# Need to create a var with all the necessary top level targets
-add_definitions(-DBOOST_TEST_DYN_LINK)
+# If we're linking Boost for DLLs, turn that on for the unit test too.
+if (QPID_LINK_BOOST_DYNAMIC)
+ add_definitions(-DBOOST_TEST_DYN_LINK)
+endif (QPID_LINK_BOOST_DYNAMIC)
+
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
include (FindPythonInterp)