summaryrefslogtreecommitdiff
path: root/cpp
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
commit2ed18fbce9793b3207de3e30ffeac60cf6055a93 (patch)
tree308278dd2ecd32be0c7459ad4853f834a8aacbc3 /cpp
parent712e0901906d8412179d6b1dc251770afd3e8fd1 (diff)
downloadqpid-python-2ed18fbce9793b3207de3e30ffeac60cf6055a93.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/qpid@1307592 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/tests/CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/tests/CMakeLists.txt b/cpp/src/tests/CMakeLists.txt
index bb4f52d319..5979ce42ae 100644
--- a/cpp/src/tests/CMakeLists.txt
+++ b/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)