merged from trunk

[SVN r49607]

CMakeLists.txt

@@ -18,3 +18,5 @@ boost_library_project(
            "Herve Bronnimann <hbr -at- poly.edu>"
   #  MAINTAINERS 
 )
+
+

minmax/index.html

@@ -56,7 +56,7 @@ be enough. The present library solves both problems.</p>
 <tt>minmax</tt>
 as straightforward extensions of the C++
 standard. As it returns a pair of <tt>const&amp;</tt>, we must use the <a
-href=:../../../../tuple/index.html>Boost.tuple</a> library to construct such
+href="../../tuple/index.html">Boost.tuple</a> library to construct such
 pairs. (Please note: the intent is not to fix the known defaults of
 <tt>std::min</tt>
 and <tt>std::max</tt>, but to add one more algorithms that combines both; see the

minmax/test/CMakeLists.txt

@@ -1,4 +1,8 @@
-boost_additional_test_dependencies(algorithm BOOST_DEPENDS test)
+#-------------------------------------------------------------------------
+#-- Needed include directories for the tests
+boost_test_add_dependent_includes("utility;detail;config;test;mpl;bind;type_traits;static_assert;preprocessor;array;iterator;timer;tuple;range")
+#-------------------------------------------------------------------------
+
 
 boost_test_run(minmax_element_test)
 boost_test_run(minmax_test)

module.cmake

@@ -1,4 +1 @@
-boost_module(algorithm DEPENDS regex concept_check range)
-
-
-
+boost_module(algorithm DEPENDS regex concept_check)

string/test/CMakeLists.txt

@@ -1,7 +1,11 @@
-boost_additional_test_dependencies(algorithm BOOST_DEPENDS test)
+#-------------------------------------------------------------------------
+#-- Needed include directories for the tests
+boost_test_add_dependent_includes("utility;detail;config;test;mpl;bind;type_traits;static_assert;preprocessor;array;iterator;exception;range;timer")
+#-------------------------------------------------------------------------
 
 
 boost_test_run(trim_test)
+
 boost_test_run(conv_test)
 boost_test_run(predicate_test)
 boost_test_run(find_test)