merged from trunk

[SVN r49607]

CMakeLists.txt

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

minmax/index.html

@@ -158,9 +158,9 @@ identical to
 that they return the last instance of the largest element (and not the
 first, as <tt>first_min_element</tt> and <tt>last_max_element</tt> would).
 <p>The family of algorithms comprising <tt>first_min_first_max_element</tt>,
-<tt>first_min_last_max_element</tt>,
-<tt>last_min_first_max_element</tt>,
-and <tt>last_min_last_max_element</tt> can be described generically as
+<tt>first_min_first_max_element</tt>,
+<tt>first_min_first_max_element</tt>,
+and <tt>first_min_first_max_element</tt> can be described generically as
 follows (using <i><tt>which</tt></i> and
 <i><tt>what</tt></i> for <tt>first</tt>
 or <tt>last</tt>): <tt><i>which</i>_min_<i>what</i>_max_element</tt> finds

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/doc/Jamfile.v2

@@ -10,10 +10,7 @@
 import toolset ;
 toolset.using doxygen ;
 
-boostbook string_algo : string_algo.xml autodoc 
-	:
-        <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html
-	;
+boostbook string_algo : string_algo.xml autodoc ;
 
 doxygen autodoc
     :   

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)