From 03bef419ac2aaaf3f3c1a2c13b7f0181b44c4755 Mon Sep 17 00:00:00 2001 From: Eric Niebler Date: Thu, 6 Nov 2008 00:15:47 +0000 Subject: [PATCH] merged from trunk [SVN r49607] --- CMakeLists.txt | 22 ++++++++++++++++++++++ doc/CMakeLists.txt | 2 ++ include/boost/function/function_base.hpp | 2 +- test/CMakeLists.txt | 20 ++++++++++++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 CMakeLists.txt create mode 100644 doc/CMakeLists.txt create mode 100644 test/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..09cdec5 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,22 @@ +#---------------------------------------------------------------------------- +# This file was automatically generated from the original CMakeLists.txt file +# Add a variable to hold the headers for the library +set (lib_headers + function.hpp + function +) + +# Add a library target to the build system +boost_library_project( + function + # SRCDIRS + TESTDIRS test + HEADERS ${lib_headers} + DOCDIRS doc + # DESCRIPTION + MODULARIZED + # AUTHORS + # MAINTAINERS +) + + diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt new file mode 100644 index 0000000..f8483bf --- /dev/null +++ b/doc/CMakeLists.txt @@ -0,0 +1,2 @@ +boost_add_documentation(function.xml + faq.xml history.xml misc.xml reference.xml tests.xml tutorial.xml) diff --git a/include/boost/function/function_base.hpp b/include/boost/function/function_base.hpp index 6612fb8..35afa16 100644 --- a/include/boost/function/function_base.hpp +++ b/include/boost/function/function_base.hpp @@ -42,7 +42,7 @@ #endif // Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info. -#ifdef BOOST_NO_EXCEPTION_STD_NAMESPACE +#ifdef BOOST_NO_STD_TYPEINFO // Embedded VC++ does not have type_info in namespace std # define BOOST_FUNCTION_STD_NS #else diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt new file mode 100644 index 0000000..51c4280 --- /dev/null +++ b/test/CMakeLists.txt @@ -0,0 +1,20 @@ +boost_test_run(lib_function_test function_test.cpp) +boost_test_run(function_n_test) +boost_test_run(allocator_test) +boost_test_run(stateless_test) +boost_test_run(lambda_test) +boost_test_compile_fail(function_test_fail1) +boost_test_compile_fail(function_test_fail2) +boost_test_compile(function_30) +boost_test_run(function_arith_cxx98) +boost_test_run(function_arith_portable) +boost_test_run(sum_avg_cxx98) +boost_test_run(sum_avg_portable) +boost_test_run(mem_fun_cxx98) +boost_test_run(mem_fun_portable) +boost_test_run(std_bind_cxx98) +boost_test_run(std_bind_portable) +boost_test_run(function_ref_cxx98) +boost_test_run(function_ref_portable) +boost_test_run(contains_test) +boost_test_run(contains2_test)