|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r49627 - in trunk: . libs libs/accumulators/test libs/algorithm libs/algorithm/minmax/test libs/algorithm/string/test libs/any/test libs/array/test libs/asio/test libs/assign/test libs/bimap/test libs/bind/test libs/circular_buffer/test libs/concept_check/test libs/config/test libs/conversion/test libs/crc/test libs/date_time/test libs/dynamic_bitset/test libs/exception/test libs/filesystem/test libs/foreach/test libs/format/test libs/function/test libs/function_types/test libs/functional/hash/examples libs/functional/hash/test libs/gil/test libs/graph/test libs/integer/test libs/interprocess/test libs/io/test libs/iostreams/test libs/iterator/test libs/lambda/test libs/logic/test libs/math/test libs/mpi/src libs/mpi/test libs/mpl/test libs/multi_array/test libs/multi_index/test libs/numeric/conversion/test libs/numeric/interval/test libs/numeric/ublas/test libs/optional/test libs/parameter/test libs/pool/test libs/preprocessor/test libs/program_options/test libs/property_map/test libs/property_tree/test libs/proto/test libs/ptr_container/test libs/python libs/random/test libs/range/test libs/rational/test libs/regex/test libs/serialization/test libs/signals/test libs/smart_ptr/test libs/spirit/test libs/statechart/test libs/thread/test libs/timer/test libs/tokenizer/test libs/tr1/test libs/tuple/test libs/typeof/test libs/units/test libs/unordered/test libs/utility/test libs/variant/test libs/xpressive/test tools tools/bcp
From: mike.jackson_at_[hidden]
Date: 2008-11-07 12:03:04
Author: imikejackson
Date: 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
New Revision: 49627
URL: http://svn.boost.org/trac/boost/changeset/49627
Log:
Updating CMake files to latest trunk. Added dependency information for regression tests and a few new macros for internal use.
Added:
trunk/libs/asio/test/CMakeLists.txt (contents, props changed)
trunk/libs/property_tree/test/CMakeLists.txt (contents, props changed)
trunk/libs/proto/test/CMakeLists.txt (contents, props changed)
trunk/libs/unordered/test/CMakeLists.txt (contents, props changed)
Text files modified:
trunk/CMakeLists.txt | 7 ++-
trunk/libs/CMakeLists.txt | 5 ++
trunk/libs/accumulators/test/CMakeLists.txt | 3 +
trunk/libs/algorithm/CMakeLists.txt | 2 -
trunk/libs/algorithm/minmax/test/CMakeLists.txt | 6 --
trunk/libs/algorithm/string/test/CMakeLists.txt | 6 --
trunk/libs/any/test/CMakeLists.txt | 2 +
trunk/libs/array/test/CMakeLists.txt | 2 +
trunk/libs/assign/test/CMakeLists.txt | 2 +
trunk/libs/bimap/test/CMakeLists.txt | 2 +
trunk/libs/bind/test/CMakeLists.txt | 2 +
trunk/libs/circular_buffer/test/CMakeLists.txt | 3 +
trunk/libs/concept_check/test/CMakeLists.txt | 2 +
trunk/libs/config/test/CMakeLists.txt | 6 +--
trunk/libs/conversion/test/CMakeLists.txt | 2 +
trunk/libs/crc/test/CMakeLists.txt | 2 +
trunk/libs/date_time/test/CMakeLists.txt | 2 +
trunk/libs/dynamic_bitset/test/CMakeLists.txt | 3 +
trunk/libs/exception/test/CMakeLists.txt | 29 +++++++++-----
trunk/libs/filesystem/test/CMakeLists.txt | 3 +
trunk/libs/foreach/test/CMakeLists.txt | 2 +
trunk/libs/format/test/CMakeLists.txt | 2 +
trunk/libs/function/test/CMakeLists.txt | 3 +
trunk/libs/function_types/test/CMakeLists.txt | 17 ++++++--
trunk/libs/functional/hash/examples/CMakeLists.txt | 2
trunk/libs/functional/hash/test/CMakeLists.txt | 2
trunk/libs/gil/test/CMakeLists.txt | 3 +
trunk/libs/graph/test/CMakeLists.txt | 8 ++-
trunk/libs/integer/test/CMakeLists.txt | 13 +++---
trunk/libs/interprocess/test/CMakeLists.txt | 3 +
trunk/libs/io/test/CMakeLists.txt | 3 +
trunk/libs/iostreams/test/CMakeLists.txt | 3 +
trunk/libs/iterator/test/CMakeLists.txt | 2 +
trunk/libs/lambda/test/CMakeLists.txt | 2 +
trunk/libs/logic/test/CMakeLists.txt | 3 +
trunk/libs/math/test/CMakeLists.txt | 2 +
trunk/libs/mpi/src/CMakeLists.txt | 13 ++++++
trunk/libs/mpi/test/CMakeLists.txt | 2 +
trunk/libs/mpl/test/CMakeLists.txt | 2 +
trunk/libs/multi_array/test/CMakeLists.txt | 3 +
trunk/libs/multi_index/test/CMakeLists.txt | 3 +
trunk/libs/numeric/conversion/test/CMakeLists.txt | 2
trunk/libs/numeric/interval/test/CMakeLists.txt | 8 ++-
trunk/libs/numeric/ublas/test/CMakeLists.txt | 15 +++++--
trunk/libs/optional/test/CMakeLists.txt | 3 +
trunk/libs/parameter/test/CMakeLists.txt | 3 +
trunk/libs/pool/test/CMakeLists.txt | 2 +
trunk/libs/preprocessor/test/CMakeLists.txt | 3 +
trunk/libs/program_options/test/CMakeLists.txt | 2 +
trunk/libs/property_map/test/CMakeLists.txt | 3 +
trunk/libs/ptr_container/test/CMakeLists.txt | 2 +
trunk/libs/python/CMakeLists.txt | 42 ++++++++++++++------
trunk/libs/random/test/CMakeLists.txt | 3 +
trunk/libs/range/test/CMakeLists.txt | 2 +
trunk/libs/rational/test/CMakeLists.txt | 3 +
trunk/libs/regex/test/CMakeLists.txt | 2 +
trunk/libs/serialization/test/CMakeLists.txt | 3 +
trunk/libs/signals/test/CMakeLists.txt | 3 +
trunk/libs/smart_ptr/test/CMakeLists.txt | 3 +
trunk/libs/spirit/test/CMakeLists.txt | 5 ++
trunk/libs/statechart/test/CMakeLists.txt | 6 +++
trunk/libs/thread/test/CMakeLists.txt | 4 ++
trunk/libs/timer/test/CMakeLists.txt | 2 +
trunk/libs/tokenizer/test/CMakeLists.txt | 2 +
trunk/libs/tr1/test/CMakeLists.txt | 6 ++
trunk/libs/tuple/test/CMakeLists.txt | 3 +
trunk/libs/typeof/test/CMakeLists.txt | 3 +
trunk/libs/units/test/CMakeLists.txt | 2 +
trunk/libs/utility/test/CMakeLists.txt | 2 +
trunk/libs/variant/test/CMakeLists.txt | 2 +
trunk/libs/xpressive/test/CMakeLists.txt | 3 +
trunk/tools/CMakeLists.txt | 79 ++++++++++++++++++++++++++++++++++++++++
trunk/tools/bcp/CMakeLists.txt | 11 ++---
73 files changed, 342 insertions(+), 76 deletions(-)
Modified: trunk/CMakeLists.txt
==============================================================================
--- trunk/CMakeLists.txt (original)
+++ trunk/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -38,7 +38,7 @@
message(STATUS " OUT THE LINE 'message(FATAL_ERROR \"\")' THAT APPEARS IN THE FILE ")
message(STATUS " ${Boost_SOURCE_DIR}/CMakeLists.txt FILE.")
message(STATUS "##########################################################################")
-message(FATAL_ERROR "")
+#message(FATAL_ERROR "")
##########################################################################
# Version information #
@@ -56,6 +56,7 @@
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+if (FALSE)
# ---------- Setup output Directories -------------------------
SET (LIBRARY_OUTPUT_PATH
${PROJECT_BINARY_DIR}/lib
@@ -69,7 +70,7 @@
CACHE PATH
"Directory for all Executables."
)
-
+endif(FALSE)
##########################################################################
@@ -241,6 +242,6 @@
# Add build rules for all of the Boost tools
# TODO: On hold while I work on the modularity code
-# add_subdirectory(tools)
+add_subdirectory(tools)
##########################################################################
Modified: trunk/libs/CMakeLists.txt
==============================================================================
--- trunk/libs/CMakeLists.txt (original)
+++ trunk/libs/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -41,6 +41,10 @@
set(BOOST_DEPENDENCY_GRAPHVIZ_FILE "${Boost_BINARY_DIR}/dependencies.dot")
file(WRITE ${BOOST_DEPENDENCY_GRAPHVIZ_FILE} "digraph boost {\n")
foreach(SUBDIR ${BOOST_SUBPROJECT_DIRS})
+ string(TOUPPER "BOOST_${SUBDIR}_COMPILED_LIB" BOOST_COMPILED_LIB_VAR)
+ if (${BOOST_COMPILED_LIB_VAR})
+ file(APPEND ${BOOST_DEPENDENCY_GRAPHVIZ_FILE} " \"${SUBDIR}\" [style=\"filled\" fillcolor=\"#A3A27C\" shape=\"box\"];\n ")
+ endif (${BOOST_COMPILED_LIB_VAR})
string(TOUPPER "BOOST_${SUBDIR}_DEPENDS" DEPENDS_VAR)
if(DEFINED ${DEPENDS_VAR})
foreach(DEP ${${DEPENDS_VAR}})
@@ -49,4 +53,5 @@
endforeach()
endif()
endforeach()
+file(APPEND ${BOOST_DEPENDENCY_GRAPHVIZ_FILE} " \"test\" [style=\"filled\" fillcolor=\"#A3A27C\" shape=\"box\"];\n ")
file(APPEND ${BOOST_DEPENDENCY_GRAPHVIZ_FILE} "}\n")
Modified: trunk/libs/accumulators/test/CMakeLists.txt
==============================================================================
--- trunk/libs/accumulators/test/CMakeLists.txt (original)
+++ trunk/libs/accumulators/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -26,6 +26,9 @@
# <toolset>intel-win:<iterator_debugging>off
# ;
+boost_additional_test_dependencies(accumulators BOOST_DEPENDS test)
+
+
set(TESTS
count
covariance
Modified: trunk/libs/algorithm/CMakeLists.txt
==============================================================================
--- trunk/libs/algorithm/CMakeLists.txt (original)
+++ trunk/libs/algorithm/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -18,5 +18,3 @@
"Herve Bronnimann <hbr -at- poly.edu>"
# MAINTAINERS
)
-
-
Modified: trunk/libs/algorithm/minmax/test/CMakeLists.txt
==============================================================================
--- trunk/libs/algorithm/minmax/test/CMakeLists.txt (original)
+++ trunk/libs/algorithm/minmax/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,8 +1,4 @@
-#-------------------------------------------------------------------------
-#-- 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_additional_test_dependencies(algorithm BOOST_DEPENDS test)
boost_test_run(minmax_element_test)
boost_test_run(minmax_test)
Modified: trunk/libs/algorithm/string/test/CMakeLists.txt
==============================================================================
--- trunk/libs/algorithm/string/test/CMakeLists.txt (original)
+++ trunk/libs/algorithm/string/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,11 +1,7 @@
-#-------------------------------------------------------------------------
-#-- 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_additional_test_dependencies(algorithm BOOST_DEPENDS test)
boost_test_run(trim_test)
-
boost_test_run(conv_test)
boost_test_run(predicate_test)
boost_test_run(find_test)
Modified: trunk/libs/any/test/CMakeLists.txt
==============================================================================
--- trunk/libs/any/test/CMakeLists.txt (original)
+++ trunk/libs/any/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(any BOOST_DEPENDS test)
+
boost_test_run(any_test ../any_test.cpp)
boost_test_compile_fail(any_cast_cv_failed)
Modified: trunk/libs/array/test/CMakeLists.txt
==============================================================================
--- trunk/libs/array/test/CMakeLists.txt (original)
+++ trunk/libs/array/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(array BOOST_DEPENDS test)
+
boost_test_run(array0 array0.cpp)
boost_test_run(array1 array1.cpp)
boost_test_run(array2 array2.cpp)
Added: trunk/libs/asio/test/CMakeLists.txt
==============================================================================
--- (empty file)
+++ trunk/libs/asio/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -0,0 +1,166 @@
+boost_additional_test_dependencies(asio BOOST_DEPENDS test)
+
+message(STATUS "asio Testing needs love")
+
+set (dep_libs "")
+
+
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+ set(os_defines "-D_XOPEN_SOURCE=600 -D_GNU_SOURCE=1")
+endif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Solaris")
+ set(dep_libs "socket;nsl")
+ set(os_defines "-D_XOPEN_SOURCE=500 -D__EXTENSIONS__")
+endif(${CMAKE_SYSTEM_NAME} STREQUAL "Solaris")
+
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ set(dep_libs "ws2_32;mswsock")
+ set(os_defines "-D_WIN32_WINNT=0x0501")
+endif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+
+if (CYGWIN)
+ set(os_defines "-D__USE_W32_SOCKETS")
+endif(CYGWIN)
+
+if (${CMAKE_SYSTEM_NAME} STREQUAL "hpux")
+ set(dep_libs "ipv6")
+ set(os_defines "-D_XOPEN_SOURCE_EXTENDED")
+endif(${CMAKE_SYSTEM_NAME} STREQUAL "hpux")
+
+
+set (USE_SELECT "-DBOOST_ASIO_DISABLE_DEV_POLL -DBOOST_ASIO_DISABLE_EPOLL -DBOOST_ASIO_DISABLE_KQUEUE -DBOOST_ASIO_DISABLE_IOCP")
+set (dep_libs "boost_system boost_date_time boost_thread")
+
+set (os_defines "${os_defines} -DBOOST_ALL_NO_LIB=1")
+
+
+boost_test_link(basic_datagram_socket basic_datagram_socket.cpp )
+boost_test_link(basic_datagram_socket_select basic_datagram_socket.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(basic_deadline_timer basic_deadline_timer.cpp )
+boost_test_link(basic_deadline_timer_select basic_deadline_timer.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(basic_socket_acceptor basic_socket_acceptor.cpp )
+boost_test_link(basic_socket_acceptor_select basic_socket_acceptor.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(basic_stream_socket basic_stream_socket.cpp )
+boost_test_link(basic_stream_socket_select basic_stream_socket.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_run(buffer buffer.cpp COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}")
+boost_test_run(buffer_select buffer.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_run(buffered_read_stream COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}")
+boost_test_run(buffered_read_stream_select buffered_read_stream.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_run(buffered_stream COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}")
+boost_test_run(buffered_stream_select buffered_stream.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_run(buffered_write_stream COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}")
+boost_test_run(buffered_write_stream_select buffered_write_stream.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_run(buffers_iterator COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}" )
+boost_test_run(buffers_iterator_select buffers_iterator.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(completion_condition completion_condition.cpp )
+boost_test_link(completion_condition_select completion_condition.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(datagram_socket_service datagram_socket_service.cpp )
+boost_test_link(datagram_socket_service_select datagram_socket_service.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(deadline_timer_service deadline_timer_service.cpp )
+boost_test_link(deadline_timer_service_select deadline_timer_service.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_run(deadline_timer COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}")
+boost_test_run(deadline_timer_select deadline_timer.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_run(error COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}")
+boost_test_run(error_select error.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_run(io_service COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}" )
+boost_test_run(io_service_select io_service.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(ip_address ip/address.cpp)
+boost_test_link(ip_address_select ip/address.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(ip_address_v4 ip/address_v4.cpp)
+boost_test_link(ip_address_v4_select ip/address_v4.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(ip_address_v6 ip/address_v6.cpp)
+boost_test_link(ip_address_v6_select ip/address_v6.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(ip_basic_endpoint ip/basic_endpoint.cpp)
+boost_test_link(ip_basic_endpoint_select ip/basic_endpoint.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(ip_basic_resolver ip/basic_resolver.cpp)
+boost_test_link(ip_basic_resolver_select ip/basic_resolver.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(ip_basic_resolver_entry ip/basic_resolver_entry.cpp)
+boost_test_link(ip_basic_resolver_entry_select ip/basic_resolver_entry.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(ip_basic_resolver_iterator ip/basic_resolver_iterator.cpp)
+boost_test_link(ip_basic_resolver_iterator_select ip/basic_resolver_iterator.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(ip_basic_resolver_query ip/basic_resolver_query.cpp )
+boost_test_link(ip_basic_resolver_query_select ip/basic_resolver_query.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_run(ip_host_name ip/host_name.cpp COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}" )
+boost_test_run(ip_host_name_select ip/host_name.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_run(ip_multicast ip/multicast.cpp COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}" )
+boost_test_run(ip_multicast_select ip/multicast.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(ip_resolver_query_base ip/resolver_query_base.cpp)
+boost_test_link(ip_resolver_query_base_select ip/resolver_query_base.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(ip_resolver_service ip/resolver_service.cpp)
+boost_test_link(ip_resolver_service_select ip/resolver_service.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_run(ip_tcp ip/tcp.cpp COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}" )
+boost_test_run(ip_tcp_select ip/tcp.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_run(ip_udp ip/udp.cpp COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}" )
+boost_test_run(ip_udp_select ip/udp.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_run(ip_unicast ip/unicast.cpp COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}" )
+boost_test_run(ip_unicast_select ip/unicast.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_run(ip_v6_only ip/v6_only.cpp COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}" )
+boost_test_run(ip_v6_only_select ip/v6_only.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_run(is_read_buffered is_read_buffered.cpp COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}" )
+boost_test_run(is_read_buffered_select is_read_buffered.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_run(is_write_buffered is_write_buffered.cpp COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}" )
+boost_test_run(is_write_buffered_select is_write_buffered.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(local_basic_endpoint local/basic_endpoint.cpp)
+boost_test_link(local_basic_endpoint_select local/basic_endpoint.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(local_connect_pair local/connect_pair.cpp)
+boost_test_link(local_connect_pair_select local/connect_pair.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(local_datagram_protocol local/datagram_protocol.cpp)
+boost_test_link(local_datagram_protocol_select local/datagram_protocol.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(local_stream_protocol local/stream_protocol.cpp)
+boost_test_link(local_stream_protocol_select local/stream_protocol.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(placeholders placeholders.cpp )
+boost_test_link(placeholders_select placeholders.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(posix_basic_descriptor posix/basic_descriptor.cpp)
+boost_test_link(posix_basic_descriptor_select posix/basic_descriptor.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(posix_basic_stream_descriptor posix/basic_stream_descriptor.cpp)
+boost_test_link(posix_basic_stream_descriptor_select posix/basic_stream_descriptor.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(posix_descriptor_base posix/descriptor_base.cpp)
+boost_test_link(posix_descriptor_base_select posix/descriptor_base.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(posix_stream_descriptor posix/stream_descriptor.cpp)
+boost_test_link(posix_stream_descriptor_select posix/stream_descriptor.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(posix_stream_descriptor_service posix/stream_descriptor_service.cpp)
+boost_test_link(posix_stream_descriptor_service_select posix/stream_descriptor_service.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_run(read read.cpp COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}" )
+boost_test_run(read_select read.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_run(read_at read_at.cpp COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}" )
+boost_test_run(read_at_select read_at.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_run(read_until read_until.cpp COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}" )
+boost_test_run(read_until_select read_until.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(socket_acceptor_service socket_acceptor_service.cpp )
+boost_test_link(socket_acceptor_service_select socket_acceptor_service.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_run(socket_base socket_base.cpp COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}" )
+boost_test_run(socket_base_select socket_base.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_run(strand strand.cpp COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}" )
+boost_test_run(strand_select strand.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(stream_socket_service stream_socket_service.cpp )
+boost_test_link(stream_socket_service_select stream_socket_service.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(time_traits time_traits.cpp )
+boost_test_link(time_traits_select time_traits.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+
+
+# Test Windows specific Behaviors
+if (MSVC)
+boost_test_link(windows_basic_handle windows/basic_handle.cpp)
+boost_test_link(windows_basic_handle_select windows/basic_handle.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(windows_basic_random_access_handle windows/basic_random_access_handle.cpp)
+boost_test_link(windows_basic_random_access_handle_select windows/basic_random_access_handle.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(windows_basic_stream_handle windows/basic_stream_handle.cpp)
+boost_test_link(windows_basic_stream_handle_select windows/basic_stream_handle.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(windows_overlapped_ptr windows/overlapped_ptr.cpp)
+boost_test_link(windows_overlapped_ptr_select windows/overlapped_ptr.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(windows_random_access_handle windows/random_access_handle.cpp)
+boost_test_link(windows_random_access_handle_select windows/random_access_handle.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(windows_random_access_handle_service windows/random_access_handle_service.cpp)
+boost_test_link(windows_random_access_handle_service_select windows/random_access_handle_service.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(windows_stream_handle windows/stream_handle.cpp)
+boost_test_link(windows_stream_handle_select windows/stream_handle.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_link(windows_stream_handle_service windows/stream_handle_service.cpp)
+boost_test_link(windows_stream_handle_service_select windows/stream_handle_service.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+endif (MSVC)
+
+
+boost_test_run(write write.cpp COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}" )
+boost_test_run(write_select write.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
+boost_test_run(write_at write_at.cpp COMPILE_FLAGS "${os_defines}" LINK_LIBS "${dep_libs}" )
+boost_test_run(write_at_select write_at.cpp COMPILE_FLAGS "${os_defines} ${USE_SELECT}" LINK_LIBS "${dep_libs}")
Modified: trunk/libs/assign/test/CMakeLists.txt
==============================================================================
--- trunk/libs/assign/test/CMakeLists.txt (original)
+++ trunk/libs/assign/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(assign BOOST_DEPENDS test multi_index)
+
SET(TESTS
basic
std
Modified: trunk/libs/bimap/test/CMakeLists.txt
==============================================================================
--- trunk/libs/bimap/test/CMakeLists.txt (original)
+++ trunk/libs/bimap/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(bimap BOOST_DEPENDS test serialization multi_index functional typeof lambda assign)
+
boost_test_run(test_tagged)
boost_test_run(test_structured_pair)
boost_test_run(test_mutant)
Modified: trunk/libs/bind/test/CMakeLists.txt
==============================================================================
--- trunk/libs/bind/test/CMakeLists.txt (original)
+++ trunk/libs/bind/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(bind BOOST_DEPENDS test)
+
SET(tests
bind_test
bind_dm_test
Modified: trunk/libs/circular_buffer/test/CMakeLists.txt
==============================================================================
--- trunk/libs/circular_buffer/test/CMakeLists.txt (original)
+++ trunk/libs/circular_buffer/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,6 @@
+boost_additional_test_dependencies(circular_buffer BOOST_DEPENDS test )
+
+
boost_test_run(base_test SINGLE_THREADED)
boost_test_run(space_optimized_test SINGLE_THREADED)
boost_test_run(soft_iterator_invalidation SINGLE_THREADED)
Modified: trunk/libs/concept_check/test/CMakeLists.txt
==============================================================================
--- trunk/libs/concept_check/test/CMakeLists.txt (original)
+++ trunk/libs/concept_check/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(concept_check BOOST_DEPENDS utility)
+
# this fails but looks like it isn't the build
# boost_test_run(../stl_concept_covering)
boost_test_run(concept_check_test ../concept_check_test.cpp)
Modified: trunk/libs/config/test/CMakeLists.txt
==============================================================================
--- trunk/libs/config/test/CMakeLists.txt (original)
+++ trunk/libs/config/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -13,13 +13,11 @@
set(BOOST_CONFIG_STATIC_THREAD_LIBS LINK_LIBS pthread rt)
endif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-#-------------------------------------------------------------------------
-#-- Needed include directories for the tests
-boost_test_add_dependent_includes("utility;detail;config;test;preprocessor;type_traits;smart_ptr;mpl;exception;static_assert")
-#-------------------------------------------------------------------------
+boost_additional_test_dependencies(config BOOST_DEPENDS test)
boost_test_run(config_test_threaded config_test.cpp
EXTRA_OPTIONS MULTI_THREADED)
+
boost_test_run(config_test
EXTRA_OPTIONS SINGLE_THREADED ${BOOST_CONFIG_MSVC_STATIC_OPTIONS}
${BOOST_CONFIG_STATIC_THREAD_LIBS})
Modified: trunk/libs/conversion/test/CMakeLists.txt
==============================================================================
--- trunk/libs/conversion/test/CMakeLists.txt (original)
+++ trunk/libs/conversion/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(conversion BOOST_DEPENDS test detail numeric)
+
boost_test_run(implicit_cast)
boost_test_compile_fail(implicit_cast_fail)
boost_test_run(cast_test ../cast_test.cpp)
Modified: trunk/libs/crc/test/CMakeLists.txt
==============================================================================
--- trunk/libs/crc/test/CMakeLists.txt (original)
+++ trunk/libs/crc/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,2 +1,4 @@
+boost_additional_test_dependencies(crc BOOST_DEPENDS test random)
+
boost_test_run(crc_test crc_test.cpp)
Modified: trunk/libs/date_time/test/CMakeLists.txt
==============================================================================
--- trunk/libs/date_time/test/CMakeLists.txt (original)
+++ trunk/libs/date_time/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(date_time BOOST_DEPENDS test bind)
+
# Core
boost_test_run(testint_adapter)
boost_test_run(testtime_resolution_traits)
Modified: trunk/libs/dynamic_bitset/test/CMakeLists.txt
==============================================================================
--- trunk/libs/dynamic_bitset/test/CMakeLists.txt (original)
+++ trunk/libs/dynamic_bitset/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,6 @@
+boost_additional_test_dependencies(dynamic_bitset BOOST_DEPENDS test config)
+
+
boost_test_run(dyn_bitset_unit_tests1 ../dyn_bitset_unit_tests1.cpp)
boost_test_run(dyn_bitset_unit_tests2 ../dyn_bitset_unit_tests2.cpp)
boost_test_run(dyn_bitset_unit_tests3 ../dyn_bitset_unit_tests3.cpp)
Modified: trunk/libs/exception/test/CMakeLists.txt
==============================================================================
--- trunk/libs/exception/test/CMakeLists.txt (original)
+++ trunk/libs/exception/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,4 @@
+boost_additional_test_dependencies(exception BOOST_DEPENDS test)
boost_test_run(is_output_streamable_test)
boost_test_run(has_to_string_test)
@@ -20,15 +21,21 @@
boost_test_compile_fail(exception_fail)
boost_test_compile_fail(throw_exception_fail)
-#headers
+# Compile headers tests
+set (compile_tests
+ diagnostic_information_hpp_test
+ error_info_hpp_test
+ exception_ptr_hpp_test
+ exception_hpp_test
+ get_error_info_hpp_test
+ info_hpp_test
+ info_tuple_hpp_test
+ to_string_hpp_test
+ to_string_stub_hpp_test
+ )
+
+#-- Create a Compile test for each source
+foreach(test ${compile_tests})
+ boost_test_compile(${test} "${test}.cpp")
+endforeach(test ${compile_tests})
-boost_test_compile(exception_ptr_hpp_test)
-boost_test_compile(diagnostic_information_hpp_test)
-boost_test_compile(enable_current_exception_hpp_test)
-boost_test_compile(enable_error_info_hpp_test)
-boost_test_compile(error_info_hpp_test)
-boost_test_compile(exception_hpp_test)
-boost_test_compile(info_hpp_test)
-boost_test_compile(info_tuple_hpp_test)
-boost_test_compile(to_string_hpp_test)
-boost_test_compile(to_string_stub_hpp_test)
Modified: trunk/libs/filesystem/test/CMakeLists.txt
==============================================================================
--- trunk/libs/filesystem/test/CMakeLists.txt (original)
+++ trunk/libs/filesystem/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,6 @@
+boost_additional_test_dependencies(filesystem BOOST_DEPENDS test bind)
+
+
ADD_DEFINITIONS(-DBOOST_ALL_NO_LIB) # -DBOOST_FILESYSTEM_STATIC_LINK)
SET(TESTS path_test operations_test
Modified: trunk/libs/foreach/test/CMakeLists.txt
==============================================================================
--- trunk/libs/foreach/test/CMakeLists.txt (original)
+++ trunk/libs/foreach/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(foreach BOOST_DEPENDS test )
+
set(TESTS
stl_byval
stl_byval_r
Modified: trunk/libs/format/test/CMakeLists.txt
==============================================================================
--- trunk/libs/format/test/CMakeLists.txt (original)
+++ trunk/libs/format/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(format BOOST_DEPENDS test)
+
boost_test_run(format_test1 DEPENDS boost_test_exec_monitor)
boost_test_run(format_test2 DEPENDS boost_test_exec_monitor)
boost_test_run(format_test3 DEPENDS boost_test_exec_monitor)
Modified: trunk/libs/function/test/CMakeLists.txt
==============================================================================
--- trunk/libs/function/test/CMakeLists.txt (original)
+++ trunk/libs/function/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,6 @@
+boost_additional_test_dependencies(function BOOST_DEPENDS test lambda)
+
+
boost_test_run(lib_function_test function_test.cpp)
boost_test_run(function_n_test)
boost_test_run(allocator_test)
Modified: trunk/libs/function_types/test/CMakeLists.txt
==============================================================================
--- trunk/libs/function_types/test/CMakeLists.txt (original)
+++ trunk/libs/function_types/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,6 @@
+# Get the boost dependencies for the tests
+boost_additional_test_dependencies(function_types BOOST_DEPENDS test fusion)
+
boost_test_compile(is_function classification/is_function.cpp)
boost_test_compile(is_function_pointer classification/is_function_pointer.cpp)
boost_test_compile(is_function_reference classification/is_function_reference.cpp)
@@ -48,16 +51,20 @@
boost_test_compile(cc_preprocessing reconfiguration/cc_preprocessing.cpp)
# Custom calling conventions
-
boost_test_compile(nonmember_ccs custom_ccs/nonmember_ccs.cpp)
boost_test_compile(nonmember_ccs_exact custom_ccs/nonmember_ccs_exact.cpp)
-boost_test_compile(member_ccs custom_ccs/member_ccs.cpp)
-boost_test_compile(member_ccs_exact custom_ccs/member_ccs_exact.cpp)
+message(STATUS "Function_Types/test/custom_ccs/member_ccs.cpp Needs love")
+#boost_test_compile(member_ccs custom_ccs/member_ccs.cpp)
+message(STATUS "Function_Types/test/custom_ccs/member_ccs_exact.cpp Needs love")
+#boost_test_compile(member_ccs_exact custom_ccs/member_ccs_exact.cpp)
-# Code from the examples
+# Code from the examples
+# Include the "example" directory
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/example")
boost_test_compile(interpreter_example ../example/interpreter_example.cpp)
boost_test_compile(result_of_example ../example/result_of_example.cpp)
boost_test_compile(interface_example ../example/interface_example.cpp)
-boost_test_compile(fast_mem_fn_example ../example/fast_mem_fn_example.cpp)
+message(STATUS "Function_Types/example/fast_mem_fn_example.cpp Needs love")
+#boost_test_compile(fast_mem_fn_example ../example/fast_mem_fn_example.cpp)
boost_test_compile(macro_type_args_example ../example/macro_type_args_example.cpp)
Modified: trunk/libs/functional/hash/examples/CMakeLists.txt
==============================================================================
--- trunk/libs/functional/hash/examples/CMakeLists.txt (original)
+++ trunk/libs/functional/hash/examples/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,6 +1,6 @@
#-------------------------------------------------------------------------
#-- Needed include directories for the tests
-boost_test_add_dependent_includes("utility;detail;config")
+boost_additional_test_dependencies(config BOOST_DEPENDS test)
#-------------------------------------------------------------------------
boost_test_run(books)
boost_test_run(point)
Modified: trunk/libs/functional/hash/test/CMakeLists.txt
==============================================================================
--- trunk/libs/functional/hash/test/CMakeLists.txt (original)
+++ trunk/libs/functional/hash/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -12,7 +12,7 @@
#-------------------------------------------------------------------------
#-- Needed include directories for the tests
-boost_test_add_dependent_includes("utility;detail;config;preprocessor;type_traits;mpl;static_assert")
+ boost_additional_test_dependencies(functional BOOST_DEPENDS test)
#-------------------------------------------------------------------------
SET(tests
Modified: trunk/libs/gil/test/CMakeLists.txt
==============================================================================
--- trunk/libs/gil/test/CMakeLists.txt (original)
+++ trunk/libs/gil/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,6 @@
+boost_additional_test_dependencies(gil BOOST_DEPENDS test lambda crc)
+
+
add_definitions(-DBOOST_GIL_NO_IO -D_SCL_SECURE_NO_WARNINGS)
boost_test_run(channel channel.cpp error_if.cpp)
boost_test_run(image image.cpp sample_image.cpp error_if.cpp)
Modified: trunk/libs/graph/test/CMakeLists.txt
==============================================================================
--- trunk/libs/graph/test/CMakeLists.txt (original)
+++ trunk/libs/graph/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(graph BOOST_DEPENDS test assign)
+
boost_test_run(transitive_closure_test)
boost_test_compile(adj_list_cc)
boost_test_run(adj_list_edge_list_set)
@@ -5,13 +7,13 @@
boost_test_run(bfs)
boost_test_compile(bfs_cc)
boost_test_run(bellman-test)
-boost_test_run(betweenness_centrality_test DEPENDS boost_graph-shared)
+boost_test_run(betweenness_centrality_test DEPENDS boost_graph SHARED)
boost_test_run(csr_graph_test)
boost_test_run(dag_longest_paths)
boost_test_run(dfs)
boost_test_compile(dfs_cc)
boost_test_compile(dijkstra_cc)
-boost_test_run(dijkstra_heap_performance ARGS 10000 DEPENDS boost_graph-shared)
+boost_test_run(dijkstra_heap_performance ARGS 10000 DEPENDS boost_graph SHARED)
boost_test_run(dominator_tree_test)
boost_test_run(relaxed_heap_test ARGS 5000 15000)
boost_test_compile(edge_list_cc)
@@ -19,7 +21,7 @@
boost_test_run(graph)
boost_test_compile(graph_concepts)
boost_test_run(graphviz_test
- DEPENDS boost_test_exec_monitor boost_graph-static)
+ DEPENDS boost_test_exec_monitor boost_graph STATIC)
boost_test_run(gursoy_atun_layout_test)
boost_test_run(layout_test)
boost_test_run(serialize DEPENDS boost_serialization)
Modified: trunk/libs/integer/test/CMakeLists.txt
==============================================================================
--- trunk/libs/integer/test/CMakeLists.txt (original)
+++ trunk/libs/integer/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,8 +1,9 @@
+boost_additional_test_dependencies(integer BOOST_DEPENDS test)
+
boost_test_run(cstdint_test cstdint_test.cpp)
-boost_test_run(integer_mask_test integer_mask_test.cpp)
-boost_test_run(integer_test integer_test.cpp)
-boost_test_run(integer_traits_test integer_traits_test.cpp
- DEPENDS boost_test_exec_monitor)
+boost_test_run(integer_mask_test integer_mask_test.cpp DEPENDS boost_test_exec_monitor)
+boost_test_run(integer_test integer_test.cpp DEPENDS boost_test_exec_monitor)
+boost_test_run(integer_traits_test integer_traits_test.cpp DEPENDS boost_test_exec_monitor)
boost_test_run(issue_2134 issue_2134.cpp)
-boost_test_run(static_log2_test static_log2_test.cpp)
-boost_test_run(static_min_max_test static_min_max_test.cpp)
+boost_test_run(static_log2_test static_log2_test.cpp DEPENDS boost_test_exec_monitor)
+boost_test_run(static_min_max_test static_min_max_test.cpp DEPENDS boost_test_exec_monitor)
Modified: trunk/libs/interprocess/test/CMakeLists.txt
==============================================================================
--- trunk/libs/interprocess/test/CMakeLists.txt (original)
+++ trunk/libs/interprocess/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,6 @@
+boost_additional_test_dependencies(interprocess BOOST_DEPENDS test thread date_time multi_index)
+
+
file(GLOB INTERPROCESS_TESTS *.cpp)
foreach(TEST ${INTERPROCESS_TESTS})
get_filename_component(TEST ${TEST} NAME_WE)
Modified: trunk/libs/io/test/CMakeLists.txt
==============================================================================
--- trunk/libs/io/test/CMakeLists.txt (original)
+++ trunk/libs/io/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,6 @@
+boost_additional_test_dependencies(io BOOST_DEPENDS test)
+
+
boost_test_run(ios_state_unit_test DEPENDS boost_unit_test_framework)
boost_test_run(ios_state_test DEPENDS boost_test_exec_monitor)
Modified: trunk/libs/iostreams/test/CMakeLists.txt
==============================================================================
--- trunk/libs/iostreams/test/CMakeLists.txt (original)
+++ trunk/libs/iostreams/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,6 @@
+boost_additional_test_dependencies(iostreams BOOST_DEPENDS test)
+
+
# Helper macro to create tests for the iostreams library
macro(iostreams_test TESTNAME)
boost_test_run(${TESTNAME}
Modified: trunk/libs/iterator/test/CMakeLists.txt
==============================================================================
--- trunk/libs/iterator/test/CMakeLists.txt (original)
+++ trunk/libs/iterator/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(iterator BOOST_DEPENDS test tuple smart_ptr)
+
# These first two tests will run last, and are expected to fail
# for many less-capable compilers.
Modified: trunk/libs/lambda/test/CMakeLists.txt
==============================================================================
--- trunk/libs/lambda/test/CMakeLists.txt (original)
+++ trunk/libs/lambda/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(lambda BOOST_DEPENDS test any)
+
boost_test_run(algorithm_test DEPENDS boost_test_exec_monitor)
boost_test_run(bind_tests_simple DEPENDS boost_test_exec_monitor)
boost_test_run(bind_tests_advanced DEPENDS boost_test_exec_monitor)
Modified: trunk/libs/logic/test/CMakeLists.txt
==============================================================================
--- trunk/libs/logic/test/CMakeLists.txt (original)
+++ trunk/libs/logic/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,6 @@
+boost_additional_test_dependencies(logic BOOST_DEPENDS test)
+
+
boost_test_run(tribool_test)
boost_test_run(tribool_rename_test)
boost_test_run(tribool_io_test)
Modified: trunk/libs/math/test/CMakeLists.txt
==============================================================================
--- trunk/libs/math/test/CMakeLists.txt (original)
+++ trunk/libs/math/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(math BOOST_DEPENDS test regex)
+
boost_test_run(common_factor_test DEPENDS boost_unit_test_framework)
boost_test_run(octonion_test
../octonion/octonion_test.cpp
Modified: trunk/libs/mpi/src/CMakeLists.txt
==============================================================================
--- trunk/libs/mpi/src/CMakeLists.txt (original)
+++ trunk/libs/mpi/src/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,14 @@
+#-- Make sure MPI is installed on the users system
+FIND_PACKAGE(MPI)
+
+if (NOT MPI_FOUND)
+ message(STATUS "MPI Not Found")
+endif (NOT MPI_FOUND)
+
+if (MPI_FOUND)
+message(STATUS "MPI Found")
+
+
add_definitions(-DBOOST_MPI_SOURCE=1)
include_directories(${MPI_INCLUDE_PATH})
@@ -30,3 +41,5 @@
message(STATUS "boost::mpi::python needs love")
+endif (MPI_FOUND)
+
Modified: trunk/libs/mpi/test/CMakeLists.txt
==============================================================================
--- trunk/libs/mpi/test/CMakeLists.txt (original)
+++ trunk/libs/mpi/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(mpi BOOST_DEPENDS test )
+
include_directories(${MPI_INCLUDE_PATH})
# Declare a test for the Boost.MPI library, which may involve both
Modified: trunk/libs/mpl/test/CMakeLists.txt
==============================================================================
--- trunk/libs/mpl/test/CMakeLists.txt (original)
+++ trunk/libs/mpl/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(mpl BOOST_DEPENDS test bind)
+
boost_test_compile(largest_int aux_/largest_int.cpp)
boost_test_compile(msvc_is_class aux_/msvc_is_class.cpp)
boost_test_compile(template_arity aux_/template_arity.cpp)
Modified: trunk/libs/multi_array/test/CMakeLists.txt
==============================================================================
--- trunk/libs/multi_array/test/CMakeLists.txt (original)
+++ trunk/libs/multi_array/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,6 @@
+boost_additional_test_dependencies(multi_array BOOST_DEPENDS test)
+
+
boost_test_compile_fail(fail_cbracket)
boost_test_compile_fail(fail_cdata)
boost_test_compile_fail(fail_citerator)
Modified: trunk/libs/multi_index/test/CMakeLists.txt
==============================================================================
--- trunk/libs/multi_index/test/CMakeLists.txt (original)
+++ trunk/libs/multi_index/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,6 @@
+boost_additional_test_dependencies(multi_index BOOST_DEPENDS test)
+
+
boost_test_run(test_basic test_basic.cpp test_basic_main.cpp)
boost_test_run(test_capacity test_capacity.cpp test_capacity_main.cpp)
boost_test_run(test_comparison test_comparison.cpp test_comparison_main.cpp)
Modified: trunk/libs/numeric/conversion/test/CMakeLists.txt
==============================================================================
--- trunk/libs/numeric/conversion/test/CMakeLists.txt (original)
+++ trunk/libs/numeric/conversion/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,6 +1,6 @@
#-------------------------------------------------------------------------
#-- Needed include directories for the tests
-boost_test_add_dependent_includes("utility;detail;config;test;mpl;preprocessor;type_traits;timer;smart_ptr;iterator;exception;static_assert;io;bind;integer")
+boost_additional_test_dependencies(numeric BOOST_DEPENDS test)
#-------------------------------------------------------------------------
boost_test_run(bounds_test)
Modified: trunk/libs/numeric/interval/test/CMakeLists.txt
==============================================================================
--- trunk/libs/numeric/interval/test/CMakeLists.txt (original)
+++ trunk/libs/numeric/interval/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -4,7 +4,7 @@
#-------------------------------------------------------------------------
#-- Needed include directories for the tests
-boost_test_add_dependent_includes("utility;detail;config;test;mpl;preprocessor;type_traits;timer;smart_ptr;iterator;exception;static_assert;io;bind;logic")
+boost_additional_test_dependencies(numeric BOOST_DEPENDS test)
#-------------------------------------------------------------------------
boost_test_compile(integer)
@@ -12,8 +12,10 @@
boost_test_run(add)
boost_test_run(det)
boost_test_run(fmod)
-boost_test_run(mul)
-boost_test_run(overflow)
+message(STATUS "numeric/interval/test/mul needs love")
+#boost_test_run(mul)
+message(STATUS "numeric/interval/test/overflow needs love")
+#boost_test_run(overflow)
boost_test_run(pi)
boost_test_run(pow)
Modified: trunk/libs/numeric/ublas/test/CMakeLists.txt
==============================================================================
--- trunk/libs/numeric/ublas/test/CMakeLists.txt (original)
+++ trunk/libs/numeric/ublas/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -22,7 +22,7 @@
#-------------------------------------------------------------------------
#-- Needed include directories for the tests
-boost_test_add_dependent_includes("utility;detail;config;test;mpl;serialization;type_traits;static_assert;preprocessor;array;iterator;exception;concept_check;concept")
+boost_additional_test_dependencies(numeric BOOST_DEPENDS test)
#-------------------------------------------------------------------------
@@ -57,8 +57,15 @@
boost_test_run(placement_new)
-#TODO:
-# <toolset>intel-linux:<cxxflags>"-Xc"
-# <toolset>darwin:<cxxflags>"-fabi-version=0"
+
+SET(test_compile_flags "-DEXTERNAL")
+#-- Intel Compiler flags
+IF( ${CMAKE_CXX_COMPILER} MATCHES "icpc" )
+ SET(test_compile_flags "${test_compile_flags} -Xc")
+ENDIF( ${CMAKE_CXX_COMPILER} MATCHES "icpc" )
+
+IF (APPLE)
+ SET(test_compile_flags "${test_compile_flags} -fabi-version=0")
+ENDIF (APPLE)
boost_test_compile(concepts COMPILE_FLAGS "-DEXTERNAL")
Modified: trunk/libs/optional/test/CMakeLists.txt
==============================================================================
--- trunk/libs/optional/test/CMakeLists.txt (original)
+++ trunk/libs/optional/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,6 @@
+boost_additional_test_dependencies(optional BOOST_DEPENDS test tuple)
+
+
boost_test_run(optional_test)
boost_test_run(optional_test_tie)
boost_test_run(optional_test_ref)
Modified: trunk/libs/parameter/test/CMakeLists.txt
==============================================================================
--- trunk/libs/parameter/test/CMakeLists.txt (original)
+++ trunk/libs/parameter/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,6 @@
+boost_additional_test_dependencies(optional BOOST_DEPENDS test timer)
+
+
boost_test_run(basics)
boost_test_run(sfinae)
boost_test_run(macros)
Modified: trunk/libs/pool/test/CMakeLists.txt
==============================================================================
--- trunk/libs/pool/test/CMakeLists.txt (original)
+++ trunk/libs/pool/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1 +1,3 @@
+boost_additional_test_dependencies(pool BOOST_DEPENDS test)
+
boost_test_run(test_pool_alloc DEPENDS boost_test_exec_monitor)
Modified: trunk/libs/preprocessor/test/CMakeLists.txt
==============================================================================
--- trunk/libs/preprocessor/test/CMakeLists.txt (original)
+++ trunk/libs/preprocessor/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,6 @@
+boost_additional_test_dependencies(preprocessor BOOST_DEPENDS test)
+
+
boost_test_compile(arithmetic)
boost_test_compile(array)
boost_test_compile(comparison)
Modified: trunk/libs/program_options/test/CMakeLists.txt
==============================================================================
--- trunk/libs/program_options/test/CMakeLists.txt (original)
+++ trunk/libs/program_options/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(program_options BOOST_DEPENDS test)
+
set(PROGRAM_OPTIONS_LIBRARIES
boost_program_options
boost_test_exec_monitor)
Modified: trunk/libs/property_map/test/CMakeLists.txt
==============================================================================
--- trunk/libs/property_map/test/CMakeLists.txt (original)
+++ trunk/libs/property_map/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,2 +1,5 @@
+boost_additional_test_dependencies(property_map BOOST_DEPENDS test concept_check any)
+
boost_test_compile(property_map_cc)
+
boost_test_run(dynamic_properties_test)
Added: trunk/libs/property_tree/test/CMakeLists.txt
==============================================================================
--- (empty file)
+++ trunk/libs/property_tree/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -0,0 +1,23 @@
+boost_additional_test_dependencies(property_tree BOOST_DEPENDS test serialization)
+
+
+#-- List our regression tests
+set (tests
+ test_property_tree
+ test_info_parser
+ test_json_parser
+ # test_xml_parser_rapidxml
+)
+message(STATUS "property_tree/test/test_xml_parser_rapidxml needs love.")
+
+# test_xml_parser_rapidxml gets compile errors that I can not figure out
+
+
+#-- Create an executable test for each
+foreach(test ${tests})
+ boost_test_run(${test} "${test}.cpp"
+ COMPILE_FLAGS ${test_compile_flags}
+ DEPENDS boost_unit_test_framework boost_serialization STATIC)
+endforeach(test ${tests})
+
+
Added: trunk/libs/proto/test/CMakeLists.txt
==============================================================================
--- (empty file)
+++ trunk/libs/proto/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -0,0 +1,51 @@
+boost_additional_test_dependencies(proto BOOST_DEPENDS test)
+
+################################################################################
+#--- Compiler specific settings
+
+# GCC
+IF(CMAKE_COMPILER_IS_GNUCC)
+ SET(test_compile_flags "-ftemplate-depth-1024")
+ENDIF(CMAKE_COMPILER_IS_GNUCC)
+
+# Microsoft Visual Studio
+IF (MSVC71)
+ #TODO// Turn off debug symbols?
+ENDIF(MSVC71)
+IF (MSVC80)
+ SET(test_compile_flags "-D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE")
+ENDIF(MSVC80)
+IF (MSVC90)
+ SET(test_compile_flags "-D_SCL_SECURE_NO_DEPRECATE")
+ENDIF (MSVC90)
+
+# Intel
+IF( ${CMAKE_CXX_COMPILER} MATCHES "icpc" )
+ #TODO// Turn off debug symbols?
+ENDIF( ${CMAKE_CXX_COMPILER} MATCHES "icpc" )
+
+set (tests
+ calculator
+ deep_copy
+ examples
+ lambda
+ make_expr
+ matches
+ proto_fusion
+ proto_fusion_s
+ toy_spirit
+ toy_spirit2
+)
+
+
+
+
+#-- Create an executable test for each source
+foreach(test ${tests})
+ boost_test_run(${test} "${test}.cpp"
+ COMPILE_FLAGS ${test_compile_flags}
+ DEPENDS boost_unit_test_framework)
+endforeach(test ${tests})
+
+
+
Modified: trunk/libs/ptr_container/test/CMakeLists.txt
==============================================================================
--- trunk/libs/ptr_container/test/CMakeLists.txt (original)
+++ trunk/libs/ptr_container/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(ptr_container BOOST_DEPENDS test assign numeric)
+
boost_test_run(ptr_inserter DEPENDS boost_unit_test_framework)
boost_test_run(ptr_vector DEPENDS boost_unit_test_framework)
boost_test_run(ptr_list DEPENDS boost_unit_test_framework)
Modified: trunk/libs/python/CMakeLists.txt
==============================================================================
--- trunk/libs/python/CMakeLists.txt (original)
+++ trunk/libs/python/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -32,25 +32,41 @@
endif(CMAKE_COMPILER_IS_GNUCXX)
endif(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
- # Macro for building Boost.Python extension modules
+################################################################################
+#-- Macro for building Boost.Python extension modules
macro(boost_python_extension MODULE_NAME)
parse_arguments(BPL_EXT
""
""
${ARGN})
-
- # Create the library target itself
- add_library(${MODULE_NAME} MODULE ${BPL_EXT_DEFAULT_ARGS} )
-
- # Miscellaneous target properties
- set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")
-
- # Link against Boost.Python library
- target_link_libraries(${MODULE_NAME} boost_python-shared)
-
- # Link against Python libraries
- target_link_libraries(${MODULE_NAME} ${PYTHON_LIBRARIES})
+
+ #TODO: The target properties are NOT being set correctly for the test libraries
+ if (FALSE)
+ # Create the library target itself
+ add_library(${MODULE_NAME} MODULE ${BPL_EXT_DEFAULT_ARGS} )
+
+ # Miscellaneous target properties
+ set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")
+
+ # Link against Boost.Python library
+ target_link_libraries(${MODULE_NAME} boost_python-static)
+
+ # Link against Python libraries
+ target_link_libraries(${MODULE_NAME} ${PYTHON_LIBRARIES})
+ endif(FALSE)
+
+ boost_add_library(
+ ${MODULE_NAME}
+ ${BPL_EXT_DEFAULT_ARGS}
+ MODULE
+ LINK_LIBS ${PYTHON_LIBRARIES}
+ DEPENDS boost_python
+ )
+
endmacro(boost_python_extension)
+#--
+################################################################################
+
boost_library_project(
Python
Modified: trunk/libs/random/test/CMakeLists.txt
==============================================================================
--- trunk/libs/random/test/CMakeLists.txt (original)
+++ trunk/libs/random/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,6 @@
+boost_additional_test_dependencies(random BOOST_DEPENDS test)
+
+
boost_test_run(random_test ../random_test.cpp)
boost_test_run(random_demo ../random_demo.cpp)
# TODO: These tests were commented out in the Jamfile.v2:
Modified: trunk/libs/range/test/CMakeLists.txt
==============================================================================
--- trunk/libs/range/test/CMakeLists.txt (original)
+++ trunk/libs/range/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(range BOOST_DEPENDS test)
+
message(STATUS "libs/range/test: need -Wall -Wunused here when under gcc")
set( test_compile_flags "")
IF(CMAKE_COMPILER_IS_GNUCC)
Modified: trunk/libs/rational/test/CMakeLists.txt
==============================================================================
--- trunk/libs/rational/test/CMakeLists.txt (original)
+++ trunk/libs/rational/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,6 @@
+boost_additional_test_dependencies(gil BOOST_DEPENDS test)
+
+
boost_test_run(rational_example rational_example.cpp)
boost_test_run(rational_test
rational_test.cpp
Modified: trunk/libs/regex/test/CMakeLists.txt
==============================================================================
--- trunk/libs/regex/test/CMakeLists.txt (original)
+++ trunk/libs/regex/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(regex BOOST_DEPENDS test)
+
# TODO: Default to multi-threaded?
macro(regex_test TESTNAME)
parse_arguments(REGEX_TEST "" "" ${ARGN})
Modified: trunk/libs/serialization/test/CMakeLists.txt
==============================================================================
--- trunk/libs/serialization/test/CMakeLists.txt (original)
+++ trunk/libs/serialization/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -87,6 +87,9 @@
endforeach(ARCHIVE ${BOOST_ARCHIVE_LIST})
endmacro(serialization_test_allarchives)
+boost_additional_test_dependencies(serialization BOOST_DEPENDS test)
+
+
serialization_test_allarchives(test_array test_array.cpp A.cpp)
serialization_test_allarchives(test_binary)
serialization_test_allarchives(test_complex)
Modified: trunk/libs/signals/test/CMakeLists.txt
==============================================================================
--- trunk/libs/signals/test/CMakeLists.txt (original)
+++ trunk/libs/signals/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,6 @@
+boost_additional_test_dependencies(signals BOOST_DEPENDS test optional)
+
+
boost_test_run(dead_slot_test DEPENDS boost_signals)
boost_test_run(deletion_test DEPENDS boost_signals)
boost_test_run(ordering_test DEPENDS boost_signals)
Modified: trunk/libs/smart_ptr/test/CMakeLists.txt
==============================================================================
--- trunk/libs/smart_ptr/test/CMakeLists.txt (original)
+++ trunk/libs/smart_ptr/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,6 @@
+boost_additional_test_dependencies(tokenizer BOOST_DEPENDS test intrusive)
+
+
boost_test_run(smart_ptr_test)
boost_test_run(shared_ptr_basic_test)
boost_test_run(shared_ptr_test)
Modified: trunk/libs/spirit/test/CMakeLists.txt
==============================================================================
--- trunk/libs/spirit/test/CMakeLists.txt (original)
+++ trunk/libs/spirit/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,4 +1,7 @@
-boost_test_run(qi_actions qi/actions.cpp)
+boost_additional_test_dependencies(spirit BOOST_DEPENDS test variant function_types intrusive lambda assign iostreams math random dynamic_bitset)
+
+
+boost_test_run(qi_actions qi/actions.cpp BOOST_LIB spirit)
boost_test_run(qi_char qi/char.cpp)
boost_test_run(qi_char_class qi/char_class.cpp)
boost_test_run(qi_lit qi/lit.cpp)
Modified: trunk/libs/statechart/test/CMakeLists.txt
==============================================================================
--- trunk/libs/statechart/test/CMakeLists.txt (original)
+++ trunk/libs/statechart/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,7 @@
+boost_additional_test_dependencies(statechart BOOST_DEPENDS test numeric)
+
+
+
macro(statechart_compile_fail TESTNAME)
boost_test_compile_fail("${TESTNAME}Normal"
${TESTNAME}.cpp
@@ -68,6 +72,8 @@
statechart_run(TypeInfoTest)
statechart_run(StateIterationTest)
statechart_run(FifoSchedulerTest)
+
+message(STATUS "Statechart Testing needs intermediate libraries created")
# TODO: We need to create some libraries (just for testing!?), then link
# and run tests against them. Ick.
#statechart-st-lib-run LibTestNormal
Modified: trunk/libs/thread/test/CMakeLists.txt
==============================================================================
--- trunk/libs/thread/test/CMakeLists.txt (original)
+++ trunk/libs/thread/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,7 @@
+boost_additional_test_dependencies(thread BOOST_DEPENDS test )
+
+
+
set(TESTS
test_thread
test_thread_id
Modified: trunk/libs/timer/test/CMakeLists.txt
==============================================================================
--- trunk/libs/timer/test/CMakeLists.txt (original)
+++ trunk/libs/timer/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1 +1,3 @@
+# boost_additional_test_dependencies(timer BOOST_DEPENDS test)
+
boost_test_compile(timer_test ../timer_test.cpp)
Modified: trunk/libs/tokenizer/test/CMakeLists.txt
==============================================================================
--- trunk/libs/tokenizer/test/CMakeLists.txt (original)
+++ trunk/libs/tokenizer/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(tokenizer BOOST_DEPENDS test config detail iterator utility array intrusive)
+
boost_test_run(examples examples.cpp
DEPENDS boost_test_exec_monitor)
boost_test_run(simple_example_1 simple_example_1.cpp)
Modified: trunk/libs/tr1/test/CMakeLists.txt
==============================================================================
--- trunk/libs/tr1/test/CMakeLists.txt (original)
+++ trunk/libs/tr1/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,10 +1,13 @@
+boost_additional_test_dependencies(tr1 BOOST_DEPENDS test)
+
+
include_directories(${Boost_SOURCE_DIR}/boost/tr1/tr1)
include_directories(${Boost_SOURCE_DIR}/libs/tr1/include/boost/tr1/tr1)
if (BORLAND)
# Borland's broken include mechanism needs these extra headers:
include_directories(${Boost_SOURCE_DIR}/boost/tr1/tr1/bcc32)
- include_directories(${Boost_SOURCE_DIR}/libs/tr1/include//boost/tr1/tr1/bcc32)
+ include_directories(${Boost_SOURCE_DIR}/libs/tr1/include/boost/tr1/tr1/bcc32)
endif (BORLAND)
macro(boost_glob_test_compile path glob_par compile_flags)
@@ -53,6 +56,7 @@
boost_glob_test_compile_fail(config tr1_has_tr1*fail.cpp "")
boost_glob_test_compile(config tr1_has_tr1*pass.cpp "")
boost_glob_test_run(type_traits *.cpp "")
+
# TODO: there's a problem here where the testing code is generating duplicate
# target names.
message(STATUS "TR1 tests need some love")
Modified: trunk/libs/tuple/test/CMakeLists.txt
==============================================================================
--- trunk/libs/tuple/test/CMakeLists.txt (original)
+++ trunk/libs/tuple/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,2 +1,5 @@
+boost_additional_test_dependencies(tuple BOOST_DEPENDS test)
+
+
boost_test_run(tuple_test_bench DEPENDS boost_test_exec_monitor)
boost_test_run(io_test DEPENDS boost_test_exec_monitor)
Modified: trunk/libs/typeof/test/CMakeLists.txt
==============================================================================
--- trunk/libs/typeof/test/CMakeLists.txt (original)
+++ trunk/libs/typeof/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,6 @@
+boost_additional_test_dependencies(typeof BOOST_DEPENDS test)
+
+
file(GLOB TEST_FILES "*.cpp")
foreach(TEST_FILE ${TEST_FILES})
if (TEST_FILE MATCHES "odr.*cpp")
Modified: trunk/libs/units/test/CMakeLists.txt
==============================================================================
--- trunk/libs/units/test/CMakeLists.txt (original)
+++ trunk/libs/units/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(typeof BOOST_DEPENDS test)
+
set(COMPILE_TESTS
test_predicates
test_negative_denominator
Added: trunk/libs/unordered/test/CMakeLists.txt
==============================================================================
--- (empty file)
+++ trunk/libs/unordered/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -0,0 +1,75 @@
+boost_additional_test_dependencies(unordered BOOST_DEPENDS test)
+
+# GCC Compilers
+IF(CMAKE_COMPILER_IS_GNUCC)
+ SET(test_compile_flags "-Wsign-promo -Wunused-parameter")
+ENDIF(CMAKE_COMPILER_IS_GNUCC)
+
+# Intel Compiler flags
+IF( ${CMAKE_CXX_COMPILER} MATCHES "icpc" )
+ SET(test_compile_flags "${test_compile_flags} -strict_ansi -cxxlib-icc")
+ENDIF( ${CMAKE_CXX_COMPILER} MATCHES "icpc" )
+
+set (swap_compile_flags "${test_compile_flags} -DBOOST_UNORDERED_SWAP_METHOD=2")
+
+#-------------------------------------------------------------------------------
+# Unordered Tests
+set (unordered_tests
+ fwd_set_test
+ fwd_map_test
+ compile_set
+ compile_map
+ link_test_1
+ link_test_2
+ simple_tests
+ equivalent_keys_tests
+ constructor_tests
+ copy_tests
+ move_tests.cpp
+ assign_tests
+ insert_tests
+ insert_stable_tests
+ unnecessary_copy_tests
+ erase_tests
+ erase_equiv_tests
+ find_tests
+ at_tests
+ bucket_tests
+ load_factor_tests
+ rehash_tests
+ equality_tests
+)
+#-- Create an executable test for each source
+foreach(test ${unordered_tests})
+ boost_test_run(${test} "unordered/${test}.cpp"
+ COMPILE_FLAGS ${test_compile_flags}
+ DEPENDS boost_unit_test_framework)
+endforeach(test ${unordered_tests})
+
+#-- run the swap test
+boost_test_run(swap_tests
+ COMPILE_FLAGS ${swap_compile_flags}
+ DEPENDS boost_unit_test_framework)
+
+#-------------------------------------------------------------------------------
+# Exception Tests
+set (exception_tests
+ constructor_exception_tests
+ copy_exception_tests
+ assign_exception_tests
+ insert_exception_tests
+ erase_exception_tests
+ rehash_exception_tests
+)
+
+#-- Create an executable test for each source
+foreach(test ${exception_tests})
+ boost_test_run(${test} "exception/${test}.cpp"
+ COMPILE_FLAGS ${test_compile_flags}
+ DEPENDS boost_unit_test_framework)
+endforeach(test ${unordered_tests})
+
+#-- run the swap test
+boost_test_run(swap_swap_exception_tests
+ COMPILE_FLAGS ${swap_compile_flags}
+ DEPENDS boost_unit_test_framework)
Modified: trunk/libs/utility/test/CMakeLists.txt
==============================================================================
--- trunk/libs/utility/test/CMakeLists.txt (original)
+++ trunk/libs/utility/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(utility BOOST_DEPENDS test)
+
boost_test_run(addressof_test ../addressof_test.cpp)
boost_test_run(assert_test ../assert_test.cpp)
boost_test_run(base_from_member_test ../base_from_member_test.cpp)
Modified: trunk/libs/variant/test/CMakeLists.txt
==============================================================================
--- trunk/libs/variant/test/CMakeLists.txt (original)
+++ trunk/libs/variant/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,5 @@
+boost_additional_test_dependencies(variant BOOST_DEPENDS test)
+
boost_test_run(test1 test1.cpp class_a.cpp)
boost_test_run(test4 test4.cpp class_a.cpp)
set(tests test2 test3 test5 test6 test7 test8 recursive_variant_test variant_reference_test variant_comparison_test variant_visit_test)
Modified: trunk/libs/xpressive/test/CMakeLists.txt
==============================================================================
--- trunk/libs/xpressive/test/CMakeLists.txt (original)
+++ trunk/libs/xpressive/test/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -7,6 +7,7 @@
# TODO: Fix these
# boost_test_fail("multipledefs")
# boost_test_fail("msvc-stlport")
+boost_additional_test_dependencies(xpressive BOOST_DEPENDS test intrusive numeric range typeof function_types)
if (NOT ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
FILE(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/libs/date_time/data")
@@ -50,7 +51,7 @@
)
foreach(runtest ${runtests})
- boost_test_run(${runtest} DEPENDS boost_unit_test_framework)
+ boost_test_run(${runtest} DEPENDS boost_unit_test_framework )
endforeach(runtest ${runtests})
set(compiletests
Modified: trunk/tools/CMakeLists.txt
==============================================================================
--- trunk/tools/CMakeLists.txt (original)
+++ trunk/tools/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -1,3 +1,82 @@
+# return a list of directories that we should add_subdirectory()
+macro(boost_collect_lib_dependencies varname filename)
+ #message(STATUS "boost_collect_lib_dependencies.... ${Boost_SOURCE_DIR}/libs")
+ file(GLOB BOOST_LIBRARY_CMAKE_FILES
+ RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${Boost_SOURCE_DIR}/libs/*/${filename}")
+ foreach(BOOST_LIB_CMAKE_FILE ${BOOST_LIBRARY_CMAKE_FILES})
+ #message(STATUS "-- BOOST_LIB_CMAKE_FILE: ${BOOST_LIB_CMAKE_FILE}")
+ get_filename_component(BOOST_LIB_DIR ${BOOST_LIB_CMAKE_FILE} PATH)
+ set(${varname} ${${varname}} ${BOOST_LIB_DIR})
+ endforeach(BOOST_LIB_CMAKE_FILE ${BOOST_LIBRARY_CMAKE_FILES})
+endmacro(boost_collect_lib_dependencies varname)
+
+
+# Find all of the subdirectories with .cmake files in them. These are
+# the libraries with dependencies.
+boost_collect_lib_dependencies(BOOST_MODULE_DIRS "module.cmake")
+foreach(subdir ${BOOST_MODULE_DIRS})
+# message(STATUS "${Boost_SOURCE_DIR}/libs/${subdir}/module.cmake")
+ include("${Boost_SOURCE_DIR}/libs/${subdir}/module.cmake")
+endforeach(subdir)
+
+
+###############################################################################
+# This macro is an internal utility macro
+# TODO: Document this if it stays around
+#
+#
+# example usage:
+# boost_tool_dependencies( BOOST_DEPENDS test)
+#
+macro(boost_tool_dependencies)
+ parse_arguments(BOOST_TEST
+ "BOOST_DEPENDS"
+ ""
+ ${ARGN}
+ )
+ set (THIS_TEST_DEPENDS_ALL "")
+ # message (STATUS "BOOST_TEST_BOOST_DEPENDS: ${BOOST_TEST_BOOST_DEPENDS}")
+ foreach(libname ${BOOST_TEST_BOOST_DEPENDS})
+ # message(STATUS "libname: ${libname}")
+ string(TOUPPER "BOOST_${libname}_DEPENDS" THIS_PROJECT_DEPENDS)
+ # message(STATUS "${THIS_PROJECT_DEPENDS}: ${${THIS_PROJECT_DEPENDS}}")
+ # set(THIS_TEST_DEPENDS_ALL ${libname} ${${THIS_PROJECT_DEPENDS}} )
+ # message(STATUS "${THIS_TEST_DEPENDS_ALL}: ${${THIS_TEST_DEPENDS_ALL}}")
+
+ list(FIND THIS_TEST_DEPENDS_ALL ${libname} DEPDEP_INDEX)
+ if (DEPDEP_INDEX EQUAL -1)
+ list(APPEND THIS_TEST_DEPENDS_ALL ${libname})
+ set(ADDED_DEPS TRUE)
+ endif()
+ string(TOUPPER "BOOST_${libname}_DEPENDS" THIS_PROJECT_DEPENDS)
+ # message(STATUS "${additional_lib}: ===> ${${THIS_PROJECT_DEPENDS}}")
+ set(ADDED_DEPS TRUE)
+ while (ADDED_DEPS)
+ set(ADDED_DEPS FALSE)
+ foreach(DEP ${THIS_TEST_DEPENDS_ALL})
+ string(TOUPPER "BOOST_${DEP}_DEPENDS" DEP_DEPENDS)
+ foreach(DEPDEP ${${DEP_DEPENDS}})
+ list(FIND THIS_TEST_DEPENDS_ALL ${DEPDEP} DEPDEP_INDEX)
+ if (DEPDEP_INDEX EQUAL -1)
+ list(APPEND THIS_TEST_DEPENDS_ALL ${DEPDEP})
+ set(ADDED_DEPS TRUE)
+ endif()
+ endforeach()
+ endforeach()
+ endwhile()
+ # message(STATUS "-> Dependencies for ${libname}")
+ # message(STATUS "-> THIS_TEST_DEPENDS_ALL: ${THIS_TEST_DEPENDS_ALL}")
+
+ endforeach(libname ${BOOST_TEST_BOOST_DEPENDS})
+ foreach (include ${THIS_TEST_DEPENDS_ALL})
+ #message(STATUS "include: ${include}")
+ include_directories("${Boost_SOURCE_DIR}/libs/${include}/include")
+ endforeach (include ${includes})
+
+endmacro(boost_tool_dependencies)
+#
+###############################################################################
+
# add_subdirectory(quickbook)
# add_subdirectory(wave)
add_subdirectory(bcp)
\ No newline at end of file
Modified: trunk/tools/bcp/CMakeLists.txt
==============================================================================
--- trunk/tools/bcp/CMakeLists.txt (original)
+++ trunk/tools/bcp/CMakeLists.txt 2008-11-07 12:02:56 EST (Fri, 07 Nov 2008)
@@ -2,11 +2,8 @@
DESCRIPTION "The bcp utility is a tool for extracting subsets of Boost."
AUTHORS "John Maddock")
-option(BOOST_BUILD_BCP "Build the bcp tool" ON)
-IF (BOOST_BUILD_BCP)
+IF (BUILD_BCP)
-# add_definitions("-DBOOST_REGEX_NO_LIB=1")
-boost_test_add_dependent_includes("filesystem;smart_ptr;config;detail;system;iterator;exception;type_traits;static_assert;utility;mpl;preprocessor;integer;regex;date_time;algorithm")
set (bcp_sources
add_path.cpp
@@ -22,10 +19,12 @@
output_licence_info.cpp
)
+boost_tool_dependencies( BOOST_DEPENDS filesystem test regex)
+
boost_add_executable(
bcp
${bcp_sources}
- DEPENDS boost_filesystem boost_prg_exec_monitor boost_regex
+ DEPENDS boost_system boost_filesystem boost_prg_exec_monitor boost_regex
)
-ENDIF (BOOST_BUILD_BCP)
\ No newline at end of file
+ENDIF (BUILD_BCP)
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk