From 265821ba0b9ea2eb77ceb9158ceb83fffe12bc8f Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Mon, 28 Oct 2013 12:39:56 +0000 Subject: QPID-5260: Significant tidy up of cmake build * Move to cmake 2.6 as minimum required version (2.4 is extremely long in the tooth now) * Add control over building individual language bindings * Make settings you don't usually want to change advanced so they are hidden by default * Changed to a uniform naming scheme for options: ** Options controlling what to build are all BUILD_ ** Options controlling features of he build are ENABLE_ ** Options controlling internal aspects of the qpid runtime are QPID_ * Respect the BUILD_TESTING option so that we won't build the tests unless it is set (it is by default) * If we don't find the boost_unit_test_framework then don't fail, just don't build the unit tests (this is motivated by one of the Apache Jenkins ubuntu builders which has this set up) * Tidied up some of the detection of external dependencies to make it more idiomatic cmake (but there is more to do here) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1536329 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/test_env.sh.in | 1 + 1 file changed, 1 insertion(+) (limited to 'qpid/cpp/src/tests/test_env.sh.in') diff --git a/qpid/cpp/src/tests/test_env.sh.in b/qpid/cpp/src/tests/test_env.sh.in index c85e1d651a..2247469cc3 100644 --- a/qpid/cpp/src/tests/test_env.sh.in +++ b/qpid/cpp/src/tests/test_env.sh.in @@ -35,6 +35,7 @@ enable_valgrind=${enable_valgrind-@ENABLE_VALGRIND@} if [ "$enable_valgrind" = "ON" ] ; then export VALGRIND=@VALGRIND_EXECUTABLE@ fi +export SASL_PW=@SASLPASSWD2_EXECUTABLE@ # Python paths and directories export PYTHON_DIR=$builddir/python -- cgit v1.2.1