[Boost-commit] svn:boost r43514 - in branches/CMake/release: libs/math/test libs/multi_index/test libs/python/test libs/serialization/src libs/serialization/test libs/wave/src tools/quickbook tools/wave

From: dgregor_at_[hidden]
Date: 2008-03-05 11:18:55

Author: dgregor
Date: 2008-03-05 11:18:54 EST (Wed, 05 Mar 2008)
New Revision: 43514
URL: http://svn.boost.org/trac/boost/changeset/43514

Log:
Update and fix CMake build and test rules for Boost 1.35.0
Text files modified: 
   branches/CMake/release/libs/math/test/CMakeLists.txt          |     2                                         
   branches/CMake/release/libs/multi_index/test/CMakeLists.txt   |     3                                         
   branches/CMake/release/libs/python/test/CMakeLists.txt        |     2                                         
   branches/CMake/release/libs/serialization/src/CMakeLists.txt  |     4                                         
   branches/CMake/release/libs/serialization/test/CMakeLists.txt |   121 +++++++++++++++++++++++++-------------- 
   branches/CMake/release/libs/wave/src/CMakeLists.txt           |     3                                         
   branches/CMake/release/tools/quickbook/CMakeLists.txt         |     3                                         
   branches/CMake/release/tools/wave/CMakeLists.txt              |     1                                         
   8 files changed, 90 insertions(+), 49 deletions(-)

Modified: branches/CMake/release/libs/math/test/CMakeLists.txt
==============================================================================
--- branches/CMake/release/libs/math/test/CMakeLists.txt	(original)
+++ branches/CMake/release/libs/math/test/CMakeLists.txt	2008-03-05 11:18:54 EST (Wed, 05 Mar 2008)
@@ -15,4 +15,4 @@
   DEPENDS boost_unit_test_framework)
 boost_test_run(complex_test)
 boost_test_run(hypot_test)
-boost_test_run(log1p_expm1_test)
+boost_test_run(log1p_expm1_test DEPENDS boost_regex)

Modified: branches/CMake/release/libs/multi_index/test/CMakeLists.txt
==============================================================================
--- branches/CMake/release/libs/multi_index/test/CMakeLists.txt	(original)
+++ branches/CMake/release/libs/multi_index/test/CMakeLists.txt	2008-03-05 11:18:54 EST (Wed, 05 Mar 2008)
@@ -17,7 +17,8 @@
 boost_test_run(test_safe_mode test_safe_mode.cpp        test_safe_mode_main.cpp)
 boost_test_run(test_serialization
   test_serialization.cpp    test_serialization1.cpp
-  test_serialization2.cpp   test_serialization_main.cpp
+  test_serialization2.cpp   test_serialization3.cpp
+  test_serialization_main.cpp
   DEPENDS boost_serialization)
 boost_test_run(test_set_ops test_set_ops.cpp          test_set_ops_main.cpp)
 boost_test_run(test_special_set_ops test_special_set_ops.cpp  test_special_set_ops_main.cpp)

Modified: branches/CMake/release/libs/python/test/CMakeLists.txt
==============================================================================
--- branches/CMake/release/libs/python/test/CMakeLists.txt	(original)
+++ branches/CMake/release/libs/python/test/CMakeLists.txt	2008-03-05 11:18:54 EST (Wed, 05 Mar 2008)
@@ -156,7 +156,7 @@
 #    <toolset>hp_cxx:<build>no
       
 boost_python_extension(map_indexing_suite_ext 
-  map_indexing_suite.cpp int_map_indexing_suite.cpp)
+  map_indexing_suite.cpp int_map_indexing_suite.cpp a_map_indexing_suite.cpp)
 
 bpl_test(map_indexing_suite 
   map_indexing_suite.py map_indexing_suite_ext)

Modified: branches/CMake/release/libs/serialization/src/CMakeLists.txt
==============================================================================
--- branches/CMake/release/libs/serialization/src/CMakeLists.txt	(original)
+++ branches/CMake/release/libs/serialization/src/CMakeLists.txt	2008-03-05 11:18:54 EST (Wed, 05 Mar 2008)
@@ -2,8 +2,8 @@
 set(SOURCES
     basic_archive.cpp
     basic_iarchive.cpp
-    basic_oarchive.cpp
     basic_iserializer.cpp
+    basic_oarchive.cpp
     basic_oserializer.cpp
     basic_pointer_iserializer.cpp
     basic_pointer_oserializer.cpp
@@ -13,6 +13,7 @@
     basic_xml_archive.cpp
     binary_iarchive.cpp
     binary_oarchive.cpp
+    codecvt_null.cpp
     extended_type_info.cpp
     extended_type_info_no_rtti.cpp
     extended_type_info_typeid.cpp
@@ -28,7 +29,6 @@
     )
     
 set(WSOURCES
-    codecvt_null.cpp
     utf8_codecvt_facet.cpp
     basic_text_wiprimitive.cpp
     basic_text_woprimitive.cpp

Modified: branches/CMake/release/libs/serialization/test/CMakeLists.txt
==============================================================================
--- branches/CMake/release/libs/serialization/test/CMakeLists.txt	(original)
+++ branches/CMake/release/libs/serialization/test/CMakeLists.txt	2008-03-05 11:18:54 EST (Wed, 05 Mar 2008)
@@ -10,8 +10,7 @@
 
 # The serialization_test macro declares a set of tests of the
 # serialization library. For each invocation of serialization_test,
-# this macro will build separate static and dynamic tests for each
-# archive type listed in BOOST_ARCHIVE_LIST.
+# this macro will build separate static and dynamic tests.
 macro(serialization_test testname)
   parse_arguments(BSL_TEST "" "NO_LIBS;POLYMORPHIC" ${ARGN})
 
@@ -27,6 +26,42 @@
     set(BSL_TEST_POLY "")
   endif(BSL_TEST_POLYMORPHIC)
   
+  set(BSL_TEST_LIBRARIES) 
+  if(NOT BSL_NO_LIBS)
+    set(BSL_TEST_LIBRARIES "boost_serialization")
+  endif(NOT BSL_NO_LIBS)
+
+  # Tests linking against the static serialization library
+  boost_test_run("${testname}"
+    ${BSL_TEST_SOURCES}
+    STATIC
+    DEPENDS boost_test_exec_monitor-static ${BSL_TEST_LIBRARIES}
+    COMPILE_FLAGS "-DBOOST_LIB_DIAGNOSTIC=1")
+    
+  # Tests linking against the shared serialization library
+  boost_test_run("${testname}_dll"
+    ${BSL_TEST_SOURCES}
+    SHARED
+    DEPENDS boost_test_exec_monitor-static ${BSL_TEST_LIBRARIES}
+    COMPILE_FLAGS "-DBOOST_LIB_DIAGNOSTIC=1 -DBOOST_ALL_DYN_LINK=1")
+endmacro(serialization_test)
+
+# Like serialization_test, but runs the same test for all archive types.
+macro(serialization_test_allarchives testname)
+  parse_arguments(BSL_TEST "" "NO_LIBS;POLYMORPHIC" ${ARGN})
+
+  if(NOT BSL_TEST_DEFAULT_ARGS)
+    set(BSL_TEST_SOURCES "${testname}.cpp")
+  else(NOT BSL_TEST_DEFAULT_ARGS)
+    set(BSL_TEST_SOURCES "${BSL_TEST_DEFAULT_ARGS}")
+  endif(NOT BSL_TEST_DEFAULT_ARGS)
+
+  if (BSL_TEST_POLYMORPHIC)
+    set(BSL_TEST_POLY "polymorphic_")
+  elseif(BSL_TEST_POLYMORPHIC)
+    set(BSL_TEST_POLY "")
+  endif(BSL_TEST_POLYMORPHIC)
+  
   foreach(ARCHIVE ${BOOST_ARCHIVE_LIST})
     set(BSL_TEST_LIBRARIES) 
     if(NOT BSL_NO_LIBS)
@@ -50,48 +85,48 @@
       DEPENDS boost_test_exec_monitor-static ${BSL_TEST_LIBRARIES}
       COMPILE_FLAGS "-DBOOST_ARCHIVE_TEST=${BSL_TEST_POLY}${ARCHIVE}.hpp -DBOOST_LIB_DIAGNOSTIC=1 -DBOOST_ALL_DYN_LINK=1")
   endforeach(ARCHIVE ${BOOST_ARCHIVE_LIST})
-endmacro(serialization_test)
+endmacro(serialization_test_allarchives)
 
-serialization_test(test_array)
-serialization_test(test_binary)
-serialization_test(test_contained_class)
-serialization_test(test_cyclic_ptrs)
-serialization_test(test_delete_pointer)
-serialization_test(test_deque)
-serialization_test(test_derived)
-serialization_test(test_derived_class)
-serialization_test(test_derived_class_ptr)
-serialization_test(test_diamond)
-serialization_test(test_exported)
-serialization_test(test_class_info_save)
-serialization_test(test_class_info_load)
-serialization_test(test_object)
-serialization_test(test_primitive)
-serialization_test(test_list)
-serialization_test(test_list_ptrs)
-serialization_test(test_map)
-serialization_test(test_mi)
-serialization_test(test_multiple_ptrs)
-serialization_test(test_no_rtti)
-serialization_test(test_non_intrusive)
-serialization_test(test_non_default_ctor)
-serialization_test(test_non_default_ctor2)
-serialization_test(test_null_ptr)
-serialization_test(test_nvp)
-serialization_test(test_recursion)
-serialization_test(test_registered)
-serialization_test(test_set)
-serialization_test(test_simple_class)
-serialization_test(test_simple_class_ptr)
-serialization_test(test_split)
-serialization_test(test_tracking)
-serialization_test(test_unregistered)
-serialization_test(test_variant)
-serialization_test(test_vector)
-serialization_test(test_optional)
-serialization_test(test_shared_ptr)
-serialization_test(test_shared_ptr_132)
-serialization_test(test_polymorphic POLYMORPHIC 
+serialization_test_allarchives(test_array)
+serialization_test_allarchives(test_binary)
+serialization_test_allarchives(test_contained_class)
+serialization_test_allarchives(test_cyclic_ptrs)
+serialization_test_allarchives(test_delete_pointer)
+serialization_test_allarchives(test_deque)
+serialization_test_allarchives(test_derived)
+serialization_test_allarchives(test_derived_class)
+serialization_test_allarchives(test_derived_class_ptr)
+serialization_test_allarchives(test_diamond)
+serialization_test_allarchives(test_exported)
+serialization_test_allarchives(test_class_info_save)
+serialization_test_allarchives(test_class_info_load)
+serialization_test_allarchives(test_object)
+serialization_test_allarchives(test_primitive)
+serialization_test_allarchives(test_list)
+serialization_test_allarchives(test_list_ptrs)
+serialization_test_allarchives(test_map)
+serialization_test_allarchives(test_mi)
+serialization_test_allarchives(test_multiple_ptrs)
+serialization_test_allarchives(test_no_rtti)
+serialization_test_allarchives(test_non_intrusive)
+serialization_test_allarchives(test_non_default_ctor)
+serialization_test_allarchives(test_non_default_ctor2)
+serialization_test_allarchives(test_null_ptr)
+serialization_test_allarchives(test_nvp)
+serialization_test_allarchives(test_recursion)
+serialization_test_allarchives(test_registered)
+serialization_test_allarchives(test_set)
+serialization_test_allarchives(test_simple_class)
+serialization_test_allarchives(test_simple_class_ptr)
+serialization_test_allarchives(test_split)
+serialization_test_allarchives(test_tracking)
+serialization_test_allarchives(test_unregistered)
+serialization_test_allarchives(test_variant)
+serialization_test_allarchives(test_vector)
+serialization_test_allarchives(test_optional)
+serialization_test_allarchives(test_shared_ptr)
+serialization_test_allarchives(test_shared_ptr_132)
+serialization_test_allarchives(test_polymorphic POLYMORPHIC 
   test_polymorphic.cpp test_polymorphic_A.cpp)
 serialization_test(test_iterators NO_LIBS)
 serialization_test(test_iterators_base64 NO_LIBS)

Modified: branches/CMake/release/libs/wave/src/CMakeLists.txt
==============================================================================
--- branches/CMake/release/libs/wave/src/CMakeLists.txt	(original)
+++ branches/CMake/release/libs/wave/src/CMakeLists.txt	2008-03-05 11:18:54 EST (Wed, 05 Mar 2008)
@@ -11,6 +11,7 @@
   wave_config_constant.cpp
   cpplexer/re2clex/aq.cpp
   cpplexer/re2clex/cpp_re.cpp
-  DEPENDS boost_filesystem
+  DEPENDS boost_filesystem boost_thread boost_date_time
   SHARED_COMPILE_FLAGS "-DBOOST_ALL_DYN_LINK=1"
+  NO_SINGLE_THREADED
 )

Modified: branches/CMake/release/tools/quickbook/CMakeLists.txt
==============================================================================
--- branches/CMake/release/tools/quickbook/CMakeLists.txt	(original)
+++ branches/CMake/release/tools/quickbook/CMakeLists.txt	2008-03-05 11:18:54 EST (Wed, 05 Mar 2008)
@@ -5,7 +5,10 @@
 boost_add_executable(quickbook
   detail/quickbook.cpp
   detail/actions.cpp
+  detail/actions_class.cpp
   detail/utils.cpp
   detail/post_process.cpp
+  detail/collector.cpp
+  detail/template_stack.cpp
   DEPENDS boost_program_options boost_filesystem
   )  

Modified: branches/CMake/release/tools/wave/CMakeLists.txt
==============================================================================
--- branches/CMake/release/tools/wave/CMakeLists.txt	(original)
+++ branches/CMake/release/tools/wave/CMakeLists.txt	2008-03-05 11:18:54 EST (Wed, 05 Mar 2008)
@@ -1,3 +1,4 @@
 boost_add_executable(wave cpp.cpp 
   DEPENDS boost_wave boost_program_options boost_filesystem boost_serialization
+  MULTI_THREADED
   )