|
|
Boost-Commit : |
From: dgregor_at_[hidden]
Date: 2007-06-18 06:52:15
Author: dgregor
Date: 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
New Revision: 7090
URL: http://svn.boost.org/trac/boost/changeset/7090
Log:
tools/build/CMake/BoostCore.cmake:
- Added boost_add_executable macro
- Refactored some of the code dealing with feature interactions
tools/build/CMake/BoostTesting.cmake:
- Use boost_add_executable to build Boost tests
tools/build/CMake/BoostConfig.cmake:
- Remove BUILD_VERSIONED, at least for now
tools/wave/CMakeLists.txt, tools/quickbook/CMakeLists.txt, tools/CMakeLists.txt:
- Add build rules for some Boost tools
CMakeLists.txt:
- Sort features by preference (RELEASE over DEBUG, etc.)
Everything else:
- Tweak to deal with changes to testing
Added:
sandbox-branches/boost-cmake/boost_1_34_0/tools/CMakeLists.txt
sandbox-branches/boost-cmake/boost_1_34_0/tools/quickbook/CMakeLists.txt
sandbox-branches/boost-cmake/boost_1_34_0/tools/wave/CMakeLists.txt
Text files modified:
sandbox-branches/boost-cmake/boost_1_34_0/CMakeLists.txt | 8
sandbox-branches/boost-cmake/boost_1_34_0/TODO | 16 -
sandbox-branches/boost-cmake/boost_1_34_0/libs/algorithm/string/test/CMakeLists.txt | 2
sandbox-branches/boost-cmake/boost_1_34_0/libs/any/test/CMakeLists.txt | 2
sandbox-branches/boost-cmake/boost_1_34_0/libs/assign/test/CMakeLists.txt | 2
sandbox-branches/boost-cmake/boost_1_34_0/libs/config/test/CMakeLists.txt | 2
sandbox-branches/boost-cmake/boost_1_34_0/libs/conversion/test/CMakeLists.txt | 2
sandbox-branches/boost-cmake/boost_1_34_0/libs/date_time/test/CMakeLists.txt | 32 +-
sandbox-branches/boost-cmake/boost_1_34_0/libs/filesystem/test/CMakeLists.txt | 4
sandbox-branches/boost-cmake/boost_1_34_0/libs/format/test/CMakeLists.txt | 8
sandbox-branches/boost-cmake/boost_1_34_0/libs/graph/src/CMakeLists.txt | 4
sandbox-branches/boost-cmake/boost_1_34_0/libs/graph/test/CMakeLists.txt | 17
sandbox-branches/boost-cmake/boost_1_34_0/libs/integer/test/CMakeLists.txt | 2
sandbox-branches/boost-cmake/boost_1_34_0/libs/io/test/CMakeLists.txt | 4
sandbox-branches/boost-cmake/boost_1_34_0/libs/iostreams/test/CMakeLists.txt | 14
sandbox-branches/boost-cmake/boost_1_34_0/libs/lambda/test/CMakeLists.txt | 30 +-
sandbox-branches/boost-cmake/boost_1_34_0/libs/math/test/CMakeLists.txt | 10
sandbox-branches/boost-cmake/boost_1_34_0/libs/multi_array/test/CMakeLists.txt | 28 +-
sandbox-branches/boost-cmake/boost_1_34_0/libs/multi_index/test/CMakeLists.txt | 2
sandbox-branches/boost-cmake/boost_1_34_0/libs/numeric/interval/test/CMakeLists.txt | 14
sandbox-branches/boost-cmake/boost_1_34_0/libs/pool/test/CMakeLists.txt | 2
sandbox-branches/boost-cmake/boost_1_34_0/libs/program_options/test/CMakeLists.txt | 8
sandbox-branches/boost-cmake/boost_1_34_0/libs/ptr_container/test/CMakeLists.txt | 28 +-
sandbox-branches/boost-cmake/boost_1_34_0/libs/python/test/CMakeLists.txt | 6
sandbox-branches/boost-cmake/boost_1_34_0/libs/range/test/CMakeLists.txt | 22 +-
sandbox-branches/boost-cmake/boost_1_34_0/libs/rational/test/CMakeLists.txt | 2
sandbox-branches/boost-cmake/boost_1_34_0/libs/regex/test/CMakeLists.txt | 24 +-
sandbox-branches/boost-cmake/boost_1_34_0/libs/serialization/test/CMakeLists.txt | 17 -
sandbox-branches/boost-cmake/boost_1_34_0/libs/signals/test/CMakeLists.txt | 12
sandbox-branches/boost-cmake/boost_1_34_0/libs/statechart/test/CMakeLists.txt | 8
sandbox-branches/boost-cmake/boost_1_34_0/libs/test/test/CMakeLists.txt | 30 +-
sandbox-branches/boost-cmake/boost_1_34_0/libs/thread/test/CMakeLists.txt | 16
sandbox-branches/boost-cmake/boost_1_34_0/libs/tokenizer/test/CMakeLists.txt | 2
sandbox-branches/boost-cmake/boost_1_34_0/libs/tuple/test/CMakeLists.txt | 4
sandbox-branches/boost-cmake/boost_1_34_0/libs/utility/test/CMakeLists.txt | 10
sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostConfig.cmake | 25 --
sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostCore.cmake | 390 ++++++++++++++++++++++++++++++++++-----
sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostTesting.cmake | 50 ++--
38 files changed, 550 insertions(+), 309 deletions(-)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -71,11 +71,12 @@
# The default set of library variants that we will be building
boost_add_default_variant(STATIC SHARED)
-boost_add_default_variant(DEBUG RELEASE)
+boost_add_default_variant(RELEASE DEBUG)
boost_add_default_variant(SINGLE_THREADED MULTI_THREADED)
-boost_add_default_variant(STATIC_RUNTIME DYNAMIC_RUNTIME)
+boost_add_default_variant(DYNAMIC_RUNTIME STATIC_RUNTIME)
# Extra features used by some libraries
+set(BUILD_PYTHON_NODEBUG ON)
boost_add_extra_variant(PYTHON_NODEBUG PYTHON_DEBUG)
##########################################################################
@@ -160,4 +161,7 @@
# Add build rules for all of the Boost libraries
add_subdirectory(libs)
+
+# Add build rules for all of the Boost tools
+add_subdirectory(tools)
##########################################################################
Modified: sandbox-branches/boost-cmake/boost_1_34_0/TODO
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/TODO (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/TODO 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -1,4 +1,3 @@
-
- Interface for building/running tests on a per-project basis. There
are CMake bugs and Brad King recommends using "test driver"
binaries. Can of worms.
@@ -6,30 +5,21 @@
- Check to see how the tests look under XCode/VS. Brad king indicates
that the one-binary-per-test setup is wrong.
-- need boost_add_executable or somesuch for building examples in projects
-
-- CMakeFiles for remaining libs
-
-- Docs
-
- Try to figure out what is happening with "empty" .o files in Mac build
- In libs/numeric/interval/test, how to detect OSF and HP's C++ compiler?
- In libs/parameter/test, fix the test that depends on Python
-- Python library: handle Python debug library variants
-
-- Testing for the Regex library
-
- Spirit library: multi-threaded tests. There must be an easy way to
handle this... support variants in testing? (I think we need
"boost_add_executable" to handle these...)
- Statechart library: deal with building libraries for testing, and
with link-only tests.
-- list_contains seems to think that "SOURCES"
- is equivalent to "BitMachine/BitMachine.cpp" (???)
- Xpressive: port multipledefs and msvc-stlport tests
+- Program options: DLL tests need to force linking against the static
+ boost_test_exec_monitor (since no others exist), even when linking
+ against the shared boost_program_options. Ugh.
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/algorithm/string/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/algorithm/string/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/algorithm/string/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -6,5 +6,5 @@
boost_test_run(split_test)
boost_test_run(join_test)
boost_test_run(replace_test)
-boost_test_run(regex_test DEPENDS boost_regex-shared)
+boost_test_run(regex_test DEPENDS boost_regex SHARED)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/any/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/any/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/any/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -1,3 +1,3 @@
boost_test_run(any_test ../any_test.cpp)
-boost_test_run(any_to_ref_test DEPENDS boost_test_exec_monitor-static)
+boost_test_run(any_to_ref_test DEPENDS boost_test_exec_monitor)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/assign/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/assign/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/assign/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -14,6 +14,6 @@
multi_index_container)
FOREACH(test ${TESTS})
- boost_test_run(${test} DEPENDS boost_unit_test_framework-static)
+ boost_test_run(${test} DEPENDS boost_unit_test_framework)
ENDFOREACH(test ${TESTS})
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/config/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/config/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/config/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -47,7 +47,7 @@
#endforeach(test ${tests_need_threadlibs})
-boost_test_run(limits_test DEPENDS boost_test_exec_monitor-static)
+boost_test_run(limits_test DEPENDS boost_test_exec_monitor)
boost_test_run(abi_test abi/abi_test.cpp abi/main.cpp)
boost_test_run(has_2arg_use_facet_pass)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/conversion/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/conversion/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/conversion/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -5,7 +5,7 @@
boost_test_run(
lexical_cast_test
../lexical_cast_test.cpp
- DEPENDS boost_unit_test_framework-static
+ DEPENDS boost_unit_test_framework
)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/date_time/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/date_time/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/date_time/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -16,7 +16,7 @@
macro(date_time_static_test SUBDIR TESTNAME)
boost_test_run(${TESTNAME}
"${SUBDIR}/${TESTNAME}.cpp"
- DEPENDS boost_date_time-static
+ DEPENDS boost_date_time STATIC
COMPILE_FLAGS ${DATE_TIME_COMPILE_FLAGS})
endmacro(date_time_static_test)
@@ -25,7 +25,7 @@
macro(date_time_shared_test SUBDIR TESTNAME)
boost_test_run("${TESTNAME}_dll"
"${SUBDIR}/${TESTNAME}.cpp"
- DEPENDS boost_date_time-shared
+ DEPENDS boost_date_time SHARED
COMPILE_FLAGS ${DATE_TIME_SHARED_COMPILE_FLAGS})
endmacro(date_time_shared_test)
@@ -84,35 +84,35 @@
# Wide streaming
boost_test_run(testgreg_wstream
"gregorian/testgreg_wstream.cpp"
- DEPENDS boost_date_time-static
+ DEPENDS boost_date_time STATIC
COMPILE_FLAGS "${DATE_TIME_COMPILE_FLAGS} -DUSE_DATE_TIME_PRE_1_33_FACET_IO")
boost_test_run(testtime_wstream
"posix_time/testtime_wstream.cpp"
- DEPENDS boost_date_time-static
+ DEPENDS boost_date_time STATIC
COMPILE_FLAGS "${DATE_TIME_COMPILE_FLAGS} -DUSE_DATE_TIME_PRE_1_33_FACET_IO")
# Pre-1.33 facets
boost_test_run(testfacet_dll
"gregorian/testfacet.cpp"
- DEPENDS boost_date_time-shared
+ DEPENDS boost_date_time SHARED
COMPILE_FLAGS "${DATE_TIME_SHARED_COMPILE_FLAGS} -DUSE_DATE_TIME_PRE_1_33_FACET_IO")
# Note: This next test was commented out in the Jamfile.v2 because "it
# crashes on VC6 (cause unknown)"
boost_test_run(testparse_date_dll
"gregorian/testparse_date.cpp"
- DEPENDS boost_date_time-shared
+ DEPENDS boost_date_time SHARED
COMPILE_FLAGS "${DATE_TIME_SHARED_COMPILE_FLAGS} -DUSE_DATE_TIME_PRE_1_33_FACET_IO")
boost_test_run(testfacet
"gregorian/testfacet.cpp"
- DEPENDS boost_date_time-static
+ DEPENDS boost_date_time STATIC
COMPILE_FLAGS "${DATE_TIME_COMPILE_FLAGS} -DUSE_DATE_TIME_PRE_1_33_FACET_IO")
boost_test_run(testparse_date
"gregorian/testparse_date.cpp"
- DEPENDS boost_date_time-static
+ DEPENDS boost_date_time STATIC
COMPILE_FLAGS "${DATE_TIME_COMPILE_FLAGS} -DUSE_DATE_TIME_PRE_1_33_FACET_IO")
boost_test_run(teststreams
"posix_time/teststreams.cpp"
- DEPENDS boost_date_time-static
+ DEPENDS boost_date_time STATIC
COMPILE_FLAGS "${DATE_TIME_COMPILE_FLAGS} -DUSE_DATE_TIME_PRE_1_33_FACET_IO")
# Local time
@@ -149,33 +149,33 @@
# xml archive tests
boost_test_run(testgreg_serialize_xml
"gregorian/testgreg_serialize.cpp"
- DEPENDS boost_date_time-static boost_serialization-static
+ DEPENDS boost_date_time boost_serialization STATIC
COMPILE_FLAGS "${DATE_TIME_COMPILE_FLAGS} -DDATE_TIME_XML_SERIALIZE")
boost_test_run(testtime_serialize_xml_std_config
"posix_time/testtime_serialize.cpp"
- DEPENDS boost_date_time-static boost_serialization-static
+ DEPENDS boost_date_time boost_serialization STATIC
COMPILE_FLAGS "${DATE_TIME_COMPILE_FLAGS} -DBOOST_DATE_TIME_POSIX_TIME_STD_CONFIG -DDATE_TIME_XML_SERIALIZE")
boost_test_run(testtime_serialize_xml
"posix_time/testtime_serialize.cpp"
- DEPENDS boost_date_time-static boost_serialization-static
+ DEPENDS boost_date_time boost_serialization STATIC
COMPILE_FLAGS "${DATE_TIME_COMPILE_FLAGS} -DDATE_TIME_XML_SERIALIZE")
# text archive tests
boost_test_run(testgreg_serialize
"gregorian/testgreg_serialize.cpp"
- DEPENDS boost_date_time-static boost_serialization-static
+ DEPENDS boost_date_time boost_serialization STATIC
COMPILE_FLAGS "${DATE_TIME_COMPILE_FLAGS}")
boost_test_run(testgreg_serialize_dll
"gregorian/testgreg_serialize.cpp"
- DEPENDS boost_date_time-shared boost_serialization-shared
+ DEPENDS boost_date_time SHARED boost_serialization SHARED
COMPILE_FLAGS "${DATE_TIME_SHARED_COMPILE_FLAGS}")
boost_test_run(testtime_serialize_std_config
"posix_time/testtime_serialize.cpp"
- DEPENDS boost_date_time-static boost_serialization-static
+ DEPENDS boost_date_time boost_serialization STATIC
COMPILE_FLAGS "${DATE_TIME_COMPILE_FLAGS} -DBOOST_DATE_TIME_POSIX_TIME_STD_CONFIG")
boost_test_run(testtime_serialize
"posix_time/testtime_serialize.cpp"
- DEPENDS boost_date_time-static boost_serialization-static
+ DEPENDS boost_date_time boost_serialization STATIC
COMPILE_FLAGS "${DATE_TIME_COMPILE_FLAGS}")
# Copyright (c) 2000-2005
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/filesystem/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/filesystem/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/filesystem/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -7,11 +7,11 @@
FOREACH(test ${TESTS})
boost_test_run(${test}_static
${test}.cpp
- DEPENDS boost_filesystem-static
+ DEPENDS boost_filesystem STATIC
COMPILE_FLAGS -DBOOST_FILESYSTEM_STATIC_LINK)
boost_test_run(${test}_dynamic
${test}.cpp
- DEPENDS boost_filesystem-shared
+ DEPENDS boost_filesystem SHARED
COMPILE_FLAGS -DBOOST_FILESYSTEM_DYN_LINK)
ENDFOREACH(test ${TESTS})
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/format/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/format/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/format/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -1,5 +1,5 @@
-boost_test_run(format_test1 DEPENDS boost_test_exec_monitor-static)
-boost_test_run(format_test2 DEPENDS boost_test_exec_monitor-static)
-boost_test_run(format_test3 DEPENDS boost_test_exec_monitor-static)
-boost_test_run(format_test_wstring DEPENDS boost_test_exec_monitor-static)
+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)
+boost_test_run(format_test_wstring DEPENDS boost_test_exec_monitor)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/graph/src/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/graph/src/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/graph/src/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -11,9 +11,9 @@
# Try to find the Expat library
include(FindEXPAT)
if (EXPAT_FOUND)
- # We have Expat, so build the GraphML parser
+ # We have Expat, so build the GraphML parser - TODO: Boost 1.34.x only
# set(BOOST_GRAPH_OPTIONAL_SOURCES
-# ${BOOST_GRAPH_OPTIONAL_SOURCES} "graphml.cpp")
+# ${BOOST_GRAPH_OPTIONAL_SOURCES} "graphml.cpp")
include_directories(${EXPAT_INCLUDE_DIRS})
set(BOOST_GRAPH_OPTIONAL_LIBRARIES
"${BOOST_GRAPH_OPTIONAL_LIBRARIES} ${EXPAT_LIBRARIES}")
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/graph/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/graph/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/graph/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -5,24 +5,24 @@
boost_test_run(bfs)
boost_test_compile(bfs_cc)
boost_test_run(bellman-test)
-boost_test_run(betweenness_centrality_test) # Note: Should only build as release
+boost_test_run(betweenness_centrality_test RELEASE)
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) NOTE: 10000
+boost_test_run(dijkstra_heap_performance ARGS 10000 RELEASE)
boost_test_run(dominator_tree_test)
-# boost_test_run(relaxed_heap_text) NOTE: 5000 15000
+boost_test_run(relaxed_heap_test ARGS 5000 15000)
boost_test_compile(edge_list_cc)
boost_test_compile(filtered_graph_cc)
boost_test_run(graph)
boost_test_compile(graph_concepts)
boost_test_run(graphviz_test
- DEPENDS boost_test_exec_monitor-static 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) NOTE: needs boost_serialization
+boost_test_run(serialize DEPENDS boost_serialization)
boost_test_compile(reverse_graph_cc)
boost_test_run(sequential_vertex_coloring)
boost_test_run(subgraph)
@@ -39,12 +39,13 @@
boost_test_run(king_ordering)
boost_test_run(matching_test)
# boost_test_run(max_flow_test)
-# boost_test_run(kolmogorov_max_flow_test)
+# boost_test_run(kolmogorov_max_flow_test) TODO: Boost 1.34.x only
-# GraphML Tests
+# GraphML Tests - not for Boost 1.34.x
#include(FindEXPAT)
#if (EXPAT_FOUND)
-# boost_test_run(graphml_test LIBRARIES boost_graph-static)
+# include_directories(${EXPAT_INCLUDE_DIRS})
+# boost_test_run(graphml_test LIBRARIES boost_graph)
#endif (EXPAT_FOUND)
# Stanford GraphBase Tests
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/integer/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/integer/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/integer/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -1,4 +1,4 @@
boost_test_run(cstdint_test ../cstdint_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-static)
+ DEPENDS boost_test_exec_monitor)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/io/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/io/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/io/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -1,3 +1,3 @@
-boost_test_run(ios_state_unit_test DEPENDS boost_unit_test_framework-static)
-boost_test_run(ios_state_test DEPENDS boost_test_exec_monitor-static)
+boost_test_run(ios_state_unit_test DEPENDS boost_unit_test_framework)
+boost_test_run(ios_state_test DEPENDS boost_test_exec_monitor)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/iostreams/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/iostreams/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/iostreams/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -2,7 +2,7 @@
macro(iostreams_test TESTNAME)
boost_test_run(${TESTNAME}
${ARGN}
- DEPENDS boost_unit_test_framework-static
+ DEPENDS boost_unit_test_framework
COMPILE_FLAGS "-DBOOST_IOSTREAMS_NO_LIB")
endmacro(iostreams_test)
@@ -19,7 +19,7 @@
iostreams_test(example_test)
iostreams_test(file_test)
boost_test_run(file_descriptor_test
- DEPENDS boost_unit_test_framework-static boost_iostreams-static
+ DEPENDS boost_unit_test_framework boost_iostreams
COMPILE_FLAGS "-DBOOST_IOSTREAMS_NO_LIB")
iostreams_test(filtering_stream_test)
iostreams_test(finite_state_filter_test)
@@ -27,14 +27,14 @@
iostreams_test(invert_test)
iostreams_test(line_filter_test)
boost_test_run(mapped_file_test
- DEPENDS boost_unit_test_framework-static boost_iostreams-static
+ DEPENDS boost_unit_test_framework boost_iostreams
COMPILE_FLAGS "-DBOOST_IOSTREAMS_NO_LIB")
iostreams_test(newline_test)
iostreams_test(null_test)
iostreams_test(pipeline_test)
iostreams_test(positioning_test)
boost_test_run(regex_filter_test
- DEPENDS boost_unit_test_framework-static boost_regex-static
+ DEPENDS boost_unit_test_framework boost_regex
COMPILE_FLAGS "-DBOOST_IOSTREAMS_NO_LIB")
iostreams_test(restrict_test)
iostreams_test(seekable_file_test)
@@ -49,10 +49,10 @@
include(FindZLIB)
if (ZLIB_FOUND)
boost_test_run(gzip_test
- DEPENDS boost_unit_test_framework-static boost_iostreams-static
+ DEPENDS boost_unit_test_framework boost_iostreams
COMPILE_FLAGS "-DBOOST_IOSTREAMS_NO_LIB")
boost_test_run(zlib_test
- DEPENDS boost_unit_test_framework-static boost_iostreams-static
+ DEPENDS boost_unit_test_framework boost_iostreams
COMPILE_FLAGS "-DBOOST_IOSTREAMS_NO_LIB")
endif(ZLIB_FOUND)
@@ -61,6 +61,6 @@
include(FindBZip2)
if (BZIP2_FOUND)
boost_test_run(bzip2_test
- DEPENDS boost_unit_test_framework-static boost_iostreams-static
+ DEPENDS boost_unit_test_framework boost_iostreams
COMPILE_FLAGS "-DBOOST_IOSTREAMS_NO_LIB")
endif(BZIP2_FOUND)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/lambda/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/lambda/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/lambda/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -1,16 +1,16 @@
-boost_test_run(algorithm_test DEPENDS boost_test_exec_monitor-static)
-boost_test_run(bind_tests_simple DEPENDS boost_test_exec_monitor-static)
-boost_test_run(bind_tests_advanced DEPENDS boost_test_exec_monitor-static)
-boost_test_run(bind_tests_simple_f_refs DEPENDS boost_test_exec_monitor-static)
-boost_test_run(bll_and_function DEPENDS boost_test_exec_monitor-static)
+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)
+boost_test_run(bind_tests_simple_f_refs DEPENDS boost_test_exec_monitor)
+boost_test_run(bll_and_function DEPENDS boost_test_exec_monitor)
boost_test_run(lambda_cast_test
- cast_test.cpp DEPENDS boost_test_exec_monitor-static)
-boost_test_run(constructor_tests DEPENDS boost_test_exec_monitor-static)
-boost_test_run(control_structures DEPENDS boost_test_exec_monitor-static)
-boost_test_run(exception_test DEPENDS boost_test_exec_monitor-static)
-boost_test_run(extending_rt_traits DEPENDS boost_test_exec_monitor-static)
-boost_test_run(is_instance_of_test DEPENDS boost_test_exec_monitor-static)
-boost_test_run(member_pointer_test DEPENDS boost_test_exec_monitor-static)
-boost_test_run(operator_tests_simple DEPENDS boost_test_exec_monitor-static)
-boost_test_run(phoenix_control_structures DEPENDS boost_test_exec_monitor-static)
-boost_test_run(switch_construct DEPENDS boost_test_exec_monitor-static)
+ cast_test.cpp DEPENDS boost_test_exec_monitor)
+boost_test_run(constructor_tests DEPENDS boost_test_exec_monitor)
+boost_test_run(control_structures DEPENDS boost_test_exec_monitor)
+boost_test_run(exception_test DEPENDS boost_test_exec_monitor)
+boost_test_run(extending_rt_traits DEPENDS boost_test_exec_monitor)
+boost_test_run(is_instance_of_test DEPENDS boost_test_exec_monitor)
+boost_test_run(member_pointer_test DEPENDS boost_test_exec_monitor)
+boost_test_run(operator_tests_simple DEPENDS boost_test_exec_monitor)
+boost_test_run(phoenix_control_structures DEPENDS boost_test_exec_monitor)
+boost_test_run(switch_construct DEPENDS boost_test_exec_monitor)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/math/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/math/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/math/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -1,18 +1,18 @@
-boost_test_run(common_factor_test DEPENDS boost_unit_test_framework-static)
+boost_test_run(common_factor_test DEPENDS boost_unit_test_framework)
boost_test_run(octonion_test
../octonion/octonion_test.cpp
- DEPENDS boost_unit_test_framework-static)
+ DEPENDS boost_unit_test_framework)
boost_test_run(quaternion_test
../quaternion/quaternion_test.cpp
- DEPENDS boost_unit_test_framework-static)
+ DEPENDS boost_unit_test_framework)
boost_test_run(special_functions_test
../special_functions/special_functions_test.cpp
- DEPENDS boost_unit_test_framework-static)
+ DEPENDS boost_unit_test_framework)
boost_test_run(quaternion_multi_incl_test
../quaternion/quaternion_mult_incl_test.cpp
../quaternion/quaternion_mi1.cpp
../quaternion/quaternion_mi2.cpp
- DEPENDS boost_unit_test_framework-static)
+ DEPENDS boost_unit_test_framework)
boost_test_run(complex_test)
boost_test_run(hypot_test)
boost_test_run(log1p_expm1_test)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/multi_array/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/multi_array/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/multi_array/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -21,18 +21,18 @@
boost_test_compile_fail(fail_ref_cview2)
boost_test_compile_fail(fail_ref_cview3)
-boost_test_run(constructors DEPENDS boost_test_exec_monitor-static)
-boost_test_run(access DEPENDS boost_test_exec_monitor-static)
-boost_test_run(compare DEPENDS boost_test_exec_monitor-static)
-boost_test_run(iterators DEPENDS boost_test_exec_monitor-static)
-boost_test_run(slice DEPENDS boost_test_exec_monitor-static)
-boost_test_run(assign DEPENDS boost_test_exec_monitor-static)
-boost_test_run(assign_to_array DEPENDS boost_test_exec_monitor-static)
-boost_test_run(index_bases DEPENDS boost_test_exec_monitor-static)
-boost_test_run(storage_order DEPENDS boost_test_exec_monitor-static)
-boost_test_run(reshape DEPENDS boost_test_exec_monitor-static)
-boost_test_run(range1 DEPENDS boost_test_exec_monitor-static )
-boost_test_run(idxgen1 DEPENDS boost_test_exec_monitor-static)
-boost_test_run(stl_interaction DEPENDS boost_test_exec_monitor-static)
-boost_test_run(resize DEPENDS boost_test_exec_monitor-static)
+boost_test_run(constructors DEPENDS boost_test_exec_monitor)
+boost_test_run(access DEPENDS boost_test_exec_monitor)
+boost_test_run(compare DEPENDS boost_test_exec_monitor)
+boost_test_run(iterators DEPENDS boost_test_exec_monitor)
+boost_test_run(slice DEPENDS boost_test_exec_monitor)
+boost_test_run(assign DEPENDS boost_test_exec_monitor)
+boost_test_run(assign_to_array DEPENDS boost_test_exec_monitor)
+boost_test_run(index_bases DEPENDS boost_test_exec_monitor)
+boost_test_run(storage_order DEPENDS boost_test_exec_monitor)
+boost_test_run(reshape DEPENDS boost_test_exec_monitor)
+boost_test_run(range1 DEPENDS boost_test_exec_monitor)
+boost_test_run(idxgen1 DEPENDS boost_test_exec_monitor)
+boost_test_run(stl_interaction DEPENDS boost_test_exec_monitor)
+boost_test_run(resize DEPENDS boost_test_exec_monitor)
boost_test_compile(concept_checks)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/multi_index/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/multi_index/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/multi_index/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -18,7 +18,7 @@
boost_test_run(test_serialization
test_serialization.cpp test_serialization1.cpp
test_serialization2.cpp test_serialization_main.cpp
- DEPENDS boost_serialization-static)
+ 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)
boost_test_run(test_update test_update.cpp test_update_main.cpp)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/numeric/interval/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/numeric/interval/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/numeric/interval/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -12,10 +12,10 @@
boost_test_run(pi)
boost_test_run(pow)
-boost_test_run(cmp DEPENDS boost_test_exec_monitor-static)
-boost_test_run(cmp_exn DEPENDS boost_test_exec_monitor-static)
-boost_test_run(cmp_exp DEPENDS boost_test_exec_monitor-static)
-boost_test_run(cmp_lex DEPENDS boost_test_exec_monitor-static)
-boost_test_run(cmp_set DEPENDS boost_test_exec_monitor-static)
-boost_test_run(cmp_tribool DEPENDS boost_test_exec_monitor-static)
-boost_test_run(test_float DEPENDS boost_test_exec_monitor-static)
+boost_test_run(cmp DEPENDS boost_test_exec_monitor)
+boost_test_run(cmp_exn DEPENDS boost_test_exec_monitor)
+boost_test_run(cmp_exp DEPENDS boost_test_exec_monitor)
+boost_test_run(cmp_lex DEPENDS boost_test_exec_monitor)
+boost_test_run(cmp_set DEPENDS boost_test_exec_monitor)
+boost_test_run(cmp_tribool DEPENDS boost_test_exec_monitor)
+boost_test_run(test_float DEPENDS boost_test_exec_monitor)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/pool/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/pool/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/pool/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -1 +1 @@
-boost_test_run(test_pool_alloc DEPENDS boost_test_exec_monitor-static)
+boost_test_run(test_pool_alloc DEPENDS boost_test_exec_monitor)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/program_options/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/program_options/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/program_options/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -1,13 +1,13 @@
set(PROGRAM_OPTIONS_LIBRARIES
- boost_program_options-static
- boost_test_exec_monitor-static)
+ boost_program_options
+ boost_test_exec_monitor)
macro(program_options_test_run TESTNAME)
boost_test_run(${TESTNAME}
- DEPENDS boost_program_options-static boost_test_exec_monitor-static)
+ DEPENDS boost_program_options boost_test_exec_monitor STATIC)
boost_test_run("${TESTNAME}_dll"
"${TESTNAME}.cpp"
- DEPENDS boost_program_options-shared boost_test_exec_monitor-static)
+ DEPENDS boost_program_options boost_test_exec_monitor-static SHARED)
endmacro(program_options_test_run)
program_options_test_run(options_description_test)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/ptr_container/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/ptr_container/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/ptr_container/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -1,14 +1,14 @@
-boost_test_run(ptr_vector DEPENDS boost_unit_test_framework-static)
-boost_test_run(ptr_list DEPENDS boost_unit_test_framework-static)
-boost_test_run(ptr_deque DEPENDS boost_unit_test_framework-static)
-boost_test_run(ptr_set DEPENDS boost_unit_test_framework-static)
-boost_test_run(ptr_map DEPENDS boost_unit_test_framework-static)
-boost_test_run(ptr_array DEPENDS boost_unit_test_framework-static)
-boost_test_run(tree_test DEPENDS boost_unit_test_framework-static)
-boost_test_run(incomplete_type_test DEPENDS boost_unit_test_framework-static)
-boost_test_run(view_example DEPENDS boost_unit_test_framework-static)
-boost_test_run(iterator_test DEPENDS boost_unit_test_framework-static)
-boost_test_run(tut1 DEPENDS boost_unit_test_framework-static)
-boost_test_run(indirect_fun DEPENDS boost_unit_test_framework-static)
-boost_test_run(serialization DEPENDS boost_unit_test_framework-static boost_serialization-static)
-boost_test_run(no_exceptions DEPENDS boost_unit_test_framework-static)
+boost_test_run(ptr_vector DEPENDS boost_unit_test_framework)
+boost_test_run(ptr_list DEPENDS boost_unit_test_framework)
+boost_test_run(ptr_deque DEPENDS boost_unit_test_framework)
+boost_test_run(ptr_set DEPENDS boost_unit_test_framework)
+boost_test_run(ptr_map DEPENDS boost_unit_test_framework)
+boost_test_run(ptr_array DEPENDS boost_unit_test_framework)
+boost_test_run(tree_test DEPENDS boost_unit_test_framework)
+boost_test_run(incomplete_type_test DEPENDS boost_unit_test_framework)
+boost_test_run(view_example DEPENDS boost_unit_test_framework)
+boost_test_run(iterator_test DEPENDS boost_unit_test_framework)
+boost_test_run(tut1 DEPENDS boost_unit_test_framework)
+boost_test_run(indirect_fun DEPENDS boost_unit_test_framework)
+boost_test_run(serialization DEPENDS boost_unit_test_framework boost_serialization)
+boost_test_run(no_exceptions DEPENDS boost_unit_test_framework)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/python/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/python/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/python/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -47,18 +47,18 @@
macro(py_run TESTNAME)
boost_test_run(${TESTNAME}
${TESTNAME}.cpp
- DEPENDS boost_python-static
+ DEPENDS boost_python STATIC
LINK_LIBS ${PYTHON_LIBRARIES})
endmacro(py_run)
boost_test_run(exec
- DEPENDS boost_python-static
+ DEPENDS boost_python STATIC
ARGS "${CMAKE_CURRENT_SOURCE_DIR}/exec.py"
LINK_LIBS ${PYTHON_LIBRARIES})
boost_test_run(exec-dynamic
exec.cpp
ARGS "${CMAKE_CURRENT_SOURCE_DIR}/exec.py"
- DEPENDS boost_python-shared
+ DEPENDS boost_python SHARED
LINK_LIBS ${PYTHON_LIBRARIES})
bpl_test(crossmod_exception
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/range/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/range/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/range/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -1,11 +1,11 @@
-boost_test_run(array DEPENDS boost_unit_test_framework-static)
-boost_test_run(iterator_pair DEPENDS boost_unit_test_framework-static)
-boost_test_run(std_container DEPENDS boost_unit_test_framework-static)
-boost_test_run(string DEPENDS boost_unit_test_framework-static)
-boost_test_run(iterator_range DEPENDS boost_unit_test_framework-static)
-boost_test_run(sub_range DEPENDS boost_unit_test_framework-static)
-boost_test_run(partial_workaround DEPENDS boost_unit_test_framework-static)
-boost_test_run(algorithm_example DEPENDS boost_unit_test_framework-static)
-boost_test_run(reversible_range DEPENDS boost_unit_test_framework-static)
-boost_test_run(const_ranges DEPENDS boost_unit_test_framework-static)
-boost_test_run(extension_mechanism DEPENDS boost_unit_test_framework-static)
+boost_test_run(array DEPENDS boost_unit_test_framework)
+boost_test_run(iterator_pair DEPENDS boost_unit_test_framework)
+boost_test_run(std_container DEPENDS boost_unit_test_framework)
+boost_test_run(string DEPENDS boost_unit_test_framework)
+boost_test_run(iterator_range DEPENDS boost_unit_test_framework)
+boost_test_run(sub_range DEPENDS boost_unit_test_framework)
+boost_test_run(partial_workaround DEPENDS boost_unit_test_framework)
+boost_test_run(algorithm_example DEPENDS boost_unit_test_framework)
+boost_test_run(reversible_range DEPENDS boost_unit_test_framework)
+boost_test_run(const_ranges DEPENDS boost_unit_test_framework)
+boost_test_run(extension_mechanism DEPENDS boost_unit_test_framework)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/rational/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/rational/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/rational/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -1,5 +1,5 @@
boost_test_run(rational_example ../rational_example.cpp)
boost_test_run(rational_test
../rational_test.cpp
- DEPENDS boost_unit_test_framework-static
+ DEPENDS boost_unit_test_framework
)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/regex/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/regex/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/regex/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -10,7 +10,7 @@
boost_test_run(${TESTNAME} ${REGEX_TEST_SOURCES}
COMPILE_FLAGS "-DBOOST_REGEX_DYN_LINK=1"
- DEPENDS boost_regex-shared)
+ DEPENDS boost_regex SHARED)
endmacro(regex_test)
set(R_SOURCES
@@ -38,15 +38,14 @@
regress/test_operators.cpp
)
-boost_test_run(regex_regress ${R_SOURCES} DEPENDS boost_regex-static)
+boost_test_run(regex_regress ${R_SOURCES} DEPENDS boost_regex STATIC)
boost_test_run(regex_regress_dll ${R_SOURCES}
COMPILE_FLAGS "-DBOOST_REGEX_DYN_LINK=1"
- DEPENDS boost_regex-shared)
+ DEPENDS boost_regex SHARED)
boost_test_run(regex_regress_threaded ${R_SOURCES}
- COMPILE_FLAGS "-DTEST_THREADS -DBOOST_REGEX_DYN_LINK=1 ${MULTI_THREADED_COMPILE_FLAGS}"
- LINK_FLAGS "${MULTI_THREADED_LINK_FLAGS}"
- LINK_LIBS "${MULTI_THREADED_LINK_LIBS}"
- DEPENDS boost_regex-mt-shared boost_thread-mt-shared)
+ COMPILE_FLAGS "-DTEST_THREADS -DBOOST_REGEX_DYN_LINK=1"
+ MULTI_THREADED SHARED
+ DEPENDS boost_regex boost_thread)
regex_test(posix_api_check c_compiler_checks/posix_api_check.c)
boost_test_compile(wide_posix_api_check_c c_compiler_checks/wide_posix_api_check.c)
@@ -56,18 +55,17 @@
regex_test(unicode_iterator_test unicode/unicode_iterator_test.cpp)
boost_test_run(static_mutex_test static_mutex/static_mutex_test.cpp
- COMPILE_FLAGS "-DBOOST_REGEX_DYN_LINK=1 ${MULTI_THREADED_COMPILE_FLAGS}"
- LINK_FLAGS "${MULTI_THREADED_LINK_FLAGS}"
- LINK_LIBS "${MULTI_THREADED_LINK_LIBS}"
- DEPENDS boost_regex-mt-shared boost_thread-mt-shared)
+ COMPILE_FLAGS "-DBOOST_REGEX_DYN_LINK=1"
+ MULTI_THREADED SHARED
+ DEPENDS boost_regex boost_thread)
regex_test(object_cache_test object_cache/object_cache_test.cpp)
boost_test_run(regex_config_info config_info/regex_config_info.cpp
- DEPENDS boost_regex-static)
+ DEPENDS boost_regex STATIC)
boost_test_run(regex_dll_config_info config_info/regex_config_info.cpp
COMPILE_FLAGS "-DBOOST_REGEX_DYN_LINK=1"
- DEPENDS boost_regex-shared)
+ DEPENDS boost_regex SHARED)
regex_test(test_collate_info collate_info/collate_info.cpp)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/serialization/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/serialization/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/serialization/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -28,29 +28,26 @@
endif(BSL_TEST_POLYMORPHIC)
foreach(ARCHIVE ${BOOST_ARCHIVE_LIST})
- set(BSL_TEST_STATIC_LIBRARIES)
- set(BSL_TEST_SHARED_LIBRARIES)
+ set(BSL_TEST_LIBRARIES)
if(NOT BSL_NO_LIBS)
- set(BSL_TEST_STATIC_LIBRARIES "boost_serialization-static")
- set(BSL_TEST_SHARED_LIBRARIES "boost_serialization-shared")
+ set(BSL_TEST_LIBRARIES "boost_serialization")
if(ARCHIVE MATCHES ".*warchive")
- set(BSL_TEST_STATIC_LIBRARIES
- "boost_wserialization-static" ${BSL_TEST_STATIC_LIBRARIES})
- set(BSL_TEST_SHARED_LIBRARIES
- "boost_wserialization-shared" ${BSL_TEST_SHARED_LIBRARIES})
+ set(BSL_TEST_LIBRARIES "boost_wserialization" ${BSL_TEST_LIBRARIES})
endif(ARCHIVE MATCHES ".*warchive")
endif(NOT BSL_NO_LIBS)
# Tests linking against the static serialization library
boost_test_run("${testname}_${ARCHIVE}"
${BSL_TEST_SOURCES}
- DEPENDS boost_test_exec_monitor-static ${BSL_TEST_STATIC_LIBRARIES}
+ STATIC
+ DEPENDS boost_test_exec_monitor-static ${BSL_TEST_LIBRARIES}
COMPILE_FLAGS "-DBOOST_ARCHIVE_TEST=${BSL_TEST_POLY}${ARCHIVE}.hpp -DBOOST_LIB_DIAGNOSTIC=1")
# Tests linking against the shared serialization library
boost_test_run("${testname}_${ARCHIVE}_dll"
${BSL_TEST_SOURCES}
- DEPENDS boost_test_exec_monitor-static ${BSL_TEST_SHARED_LIBRARIES}
+ SHARED
+ 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)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/signals/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/signals/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/signals/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -1,6 +1,6 @@
-boost_test_run(dead_slot_test DEPENDS boost_signals-static)
-boost_test_run(deletion_test DEPENDS boost_signals-static)
-boost_test_run(ordering_test DEPENDS boost_signals-static)
-boost_test_run(signal_n_test DEPENDS boost_signals-static)
-boost_test_run(signal_test DEPENDS boost_signals-static)
-boost_test_run(trackable_test DEPENDS boost_signals-static)
+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)
+boost_test_run(signal_n_test DEPENDS boost_signals)
+boost_test_run(signal_test DEPENDS boost_signals)
+boost_test_run(trackable_test DEPENDS boost_signals)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/statechart/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/statechart/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/statechart/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -20,22 +20,22 @@
boost_test_run("${TESTNAME}Normal"
${TESTNAME}.cpp
COMPILE_FLAGS "-DBOOST_DISABLE_THREADS"
- DEPENDS boost_test_exec_monitor-static
+ DEPENDS boost_test_exec_monitor
)
boost_test_run("${TESTNAME}Native"
${TESTNAME}.cpp
COMPILE_FLAGS "-DBOOST_DISABLE_THREADS -DBOOST_STATECHART_USE_NATIVE_RTTI"
- DEPENDS boost_test_exec_monitor-static
+ DEPENDS boost_test_exec_monitor
)
boost_test_run("${TESTNAME}Relaxed"
${TESTNAME}.cpp
COMPILE_FLAGS "-DBOOST_DISABLE_THREADS -DBOOST_STATECHART_RELAX_TRANSITION_CONTEXT"
- DEPENDS boost_test_exec_monitor-static
+ DEPENDS boost_test_exec_monitor
)
boost_test_run("${TESTNAME}Both"
${TESTNAME}.cpp
COMPILE_FLAGS "-DBOOST_DISABLE_THREADS -DBOOST_STATECHART_USE_NATIVE_RTTI -DBOOST_STATECHART_RELAX_TRANSITION_CONTEXT"
- DEPENDS boost_test_exec_monitor-static
+ DEPENDS boost_test_exec_monitor
)
endmacro(statechart_run)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/test/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/test/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/test/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -7,37 +7,37 @@
endif(BORLAND)
# Basic tests
-boost_test_run(class_properties_test DEPENDS boost_unit_test_framework-static)
-boost_test_run(basic_cstring_test DEPENDS boost_unit_test_framework-static)
+boost_test_run(class_properties_test DEPENDS boost_unit_test_framework)
+boost_test_run(basic_cstring_test DEPENDS boost_unit_test_framework)
# Program execution monitor tests
-boost_test_run_fail(prg_exec_fail1 DEPENDS boost_prg_exec_monitor-static)
-boost_test_run_fail(prg_exec_fail2 DEPENDS boost_prg_exec_monitor-static)
-boost_test_run_fail(prg_exec_fail3 DEPENDS boost_prg_exec_monitor-static)
-boost_test_run_fail(prg_exec_fail4 DEPENDS boost_prg_exec_monitor-static)
+boost_test_run_fail(prg_exec_fail1 DEPENDS boost_prg_exec_monitor)
+boost_test_run_fail(prg_exec_fail2 DEPENDS boost_prg_exec_monitor)
+boost_test_run_fail(prg_exec_fail3 DEPENDS boost_prg_exec_monitor)
+boost_test_run_fail(prg_exec_fail4 DEPENDS boost_prg_exec_monitor)
# Unit test framework tests
# NOTE: skipped errors_handling_test until I figure out what BBv2 is doing
boost_test_run(online_test)
boost_test_run_fail(minimal_test)
boost_test_run(foreach_test)
-boost_test_run(output_test_stream_test DEPENDS boost_unit_test_framework-shared)
+boost_test_run(output_test_stream_test DEPENDS boost_unit_test_framework SHARED)
# NOTE: skipped result_report_test until I figure out what BBv2 is doing
-boost_test_run(parameterized_test_test DEPENDS boost_unit_test_framework-shared)
-boost_test_run(test_fp_comparisons DEPENDS boost_unit_test_framework-shared)
+boost_test_run(parameterized_test_test DEPENDS boost_unit_test_framework SHARED)
+boost_test_run(test_fp_comparisons DEPENDS boost_unit_test_framework SHARED)
# NOTE: skipped test_tools_test until I figure out what BBv2 is doing
-boost_test_run(test_case_template_test DEPENDS boost_unit_test_framework-shared)
+boost_test_run(test_case_template_test DEPENDS boost_unit_test_framework SHARED)
-boost_test_run(custom_exception_test DEPENDS boost_unit_test_framework-static)
+boost_test_run(custom_exception_test DEPENDS boost_unit_test_framework)
-boost_test_run(fixed_mapping_test DEPENDS boost_unit_test_framework-shared)
+boost_test_run(fixed_mapping_test DEPENDS boost_unit_test_framework SHARED)
# NOTE: skipped ifstream_line_iterator_test until I figure out what BBv2 is doing
-boost_test_run(algorithms_test DEPENDS boost_unit_test_framework-static)
-boost_test_run(token_iterator_test DEPENDS boost_unit_test_framework-shared)
-boost_test_run(boost_check_equal_str DEPENDS boost_unit_test_framework-shared)
+boost_test_run(algorithms_test DEPENDS boost_unit_test_framework)
+boost_test_run(token_iterator_test DEPENDS boost_unit_test_framework SHARED)
+boost_test_run(boost_check_equal_str DEPENDS boost_unit_test_framework SHARED)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/thread/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/thread/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/thread/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -1,8 +1,8 @@
-boost_test_run(test_thread DEPENDS boost_thread-mt-static boost_unit_test_framework-mt-static)
-boost_test_run(test_mutex DEPENDS boost_thread-mt-static boost_unit_test_framework-mt-static)
-boost_test_run(test_condition DEPENDS boost_thread-mt-static boost_unit_test_framework-mt-static)
-boost_test_run(test_tss DEPENDS boost_thread-mt-static boost_unit_test_framework-mt-static)
-boost_test_run(test_once DEPENDS boost_thread-mt-static boost_unit_test_framework-mt-static)
-boost_test_run(test_xtime DEPENDS boost_thread-mt-static boost_unit_test_framework-mt-static)
-boost_test_run(test_barrier DEPENDS boost_thread-mt-static boost_unit_test_framework-mt-static)
-#boost_test_run(test_read_write_mutex DEPENDS boost_thread-static boost_unit_test_framework-static)
+boost_test_run(test_thread MULTI_THREADED DEPENDS boost_thread boost_unit_test_framework)
+boost_test_run(test_mutex MULTI_THREADED DEPENDS boost_thread boost_unit_test_framework)
+boost_test_run(test_condition MULTI_THREADED DEPENDS boost_thread boost_unit_test_framework)
+boost_test_run(test_tss MULTI_THREADED DEPENDS boost_thread boost_unit_test_framework)
+boost_test_run(test_once MULTI_THREADED DEPENDS boost_thread boost_unit_test_framework)
+boost_test_run(test_xtime MULTI_THREADED DEPENDS boost_thread boost_unit_test_framework)
+boost_test_run(test_barrier MULTI_THREADED DEPENDS boost_thread boost_unit_test_framework)
+#boost_test_run(test_read_write_mutex DEPENDS boost_thread-static boost_unit_test_framework)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/tokenizer/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/tokenizer/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/tokenizer/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -1,5 +1,5 @@
boost_test_run(examples ../examples.cpp
- DEPENDS boost_test_exec_monitor-static)
+ DEPENDS boost_test_exec_monitor)
boost_test_run(simple_example_1 ../simple_example_1.cpp)
boost_test_run(simple_example_2 ../simple_example_2.cpp)
boost_test_run(simple_example_3 ../simple_example_3.cpp)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/tuple/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/tuple/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/tuple/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -1,2 +1,2 @@
-boost_test_run(tuple_test_bench DEPENDS boost_test_exec_monitor-static)
-boost_test_run(io_test DEPENDS boost_test_exec_monitor-static)
+boost_test_run(tuple_test_bench DEPENDS boost_test_exec_monitor)
+boost_test_run(io_test DEPENDS boost_test_exec_monitor)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/utility/test/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/utility/test/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/utility/test/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -6,12 +6,12 @@
boost_test_compile_fail(checked_delete_test ../checked_delete_test.cpp)
boost_test_run(compressed_pair_test
../compressed_pair_test
- DEPENDS boost_test_exec_monitor-static)
+ DEPENDS boost_test_exec_monitor)
boost_test_run(current_function_test ../current_function_test.cpp)
boost_test_run(iterators_test
../iterators_test.cpp
- DEPENDS boost_test_exec_monitor-static)
-boost_test_run(next_prior_test DEPENDS boost_test_exec_monitor-static)
+ DEPENDS boost_test_exec_monitor)
+boost_test_run(next_prior_test DEPENDS boost_test_exec_monitor)
boost_test_compile_fail(noncopyable_test ../noncopyable_test.cpp)
boost_test_run(numeric_traits_test ../numeric_traits_test.cpp)
if (${CMAKE_SYSTEM} MATCHES "FreeBSD-.*")
@@ -19,12 +19,12 @@
elseif(${CMAKE_SYSTEM} MATCHES "FreeBSD-.*")
boost_test_run(operators_test
../operators_test.cpp
- DEPENDS boost_test_exec_monitor-static)
+ DEPENDS boost_test_exec_monitor)
endif(${CMAKE_SYSTEM} MATCHES "FreeBSD-.*")
boost_test_compile(ref_ct_test ../ref_ct_test.cpp)
boost_test_run(ref_test
../ref_test.cpp
- DEPENDS boost_test_exec_monitor-static)
+ DEPENDS boost_test_exec_monitor)
boost_test_compile(result_of_test)
boost_test_run(shared_iterator_test ../shared_iterator_test.cpp)
boost_test_run(value_init_test ../value_init_test.cpp)
Added: sandbox-branches/boost-cmake/boost_1_34_0/tools/CMakeLists.txt
==============================================================================
--- (empty file)
+++ sandbox-branches/boost-cmake/boost_1_34_0/tools/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -0,0 +1,2 @@
+add_subdirectory(quickbook)
+add_subdirectory(wave)
\ No newline at end of file
Modified: sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostConfig.cmake
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostConfig.cmake (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostConfig.cmake 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -59,31 +59,6 @@
endif(MSVC60)
endif (NOT BOOST_TOOLSET)
-# Determine whether we should use library versioning by default
-if(BOOST_TOOLSET)
- set(BUILD_VERSIONED_BY_DEFAULT ON)
-else(BOOST_TOOLSET)
- set(BUILD_VERSIONED_BY_DEFAULT OFF)
-endif(BOOST_TOOLSET)
-
-option(
- BUILD_VERSIONED
- "Use versioned library names, e.g., boost_filesystem-gcc41-1_34"
- ${BUILD_VERSIONED_BY_DEFAULT})
-
-if(BUILD_VERSIONED)
- # Set BOOST_TOOLSET to the string that describes the
- # Boost.Build toolset. This is used as part of the versioned library
- # name.
- if(NOT BOOST_TOOLSET)
- message("Unable to determine compiler toolset. Library versioning cannot be used")
- set(BUILD_VERSIONED OFF CACHE BOOL
- "Use versioned library names, e.g., boost_filesystem-gcc41-1_34" FORCE)
- set(BOOST_LIBRARY_VERSION_STRING "")
- set(BOOST_LIBRARY_VERSION_STRING_DEBUG "")
- endif(NOT BOOST_TOOLSET)
-endif(BUILD_VERSIONED)
-
# Multi-threading support
if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
set(MULTI_THREADED_COMPILE_FLAGS "-pthreads")
Modified: sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostCore.cmake
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostCore.cmake (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostCore.cmake 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -15,6 +15,8 @@
# #
# boost_add_library: Builds library binaries for Boost libraries #
# with compiled sources (e.g., boost_filesystem). #
+# #
+# boost_add_executable: Builds executables. #
##########################################################################
# Defines a Boost library project (e.g., for Boost.Python). Use as:
@@ -72,9 +74,12 @@
string(TOLOWER "${LIBNAME}" libname)
project(${libname})
- if(NOT EXISTS ${CMAKE_BINARY_DIR}/bin/${PROJECT_NAME})
- file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin/${PROJECT_NAME})
- endif(NOT EXISTS ${CMAKE_BINARY_DIR}/bin/${PROJECT_NAME})
+ if(NOT EXISTS ${CMAKE_BINARY_DIR}/bin/tests)
+ file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin/tests)
+ endif(NOT EXISTS ${CMAKE_BINARY_DIR}/bin/tests)
+ if(NOT EXISTS ${CMAKE_BINARY_DIR}/bin/tests/${PROJECT_NAME})
+ file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin/tests/${PROJECT_NAME})
+ endif(NOT EXISTS ${CMAKE_BINARY_DIR}/bin/tests/${PROJECT_NAME})
# Include each of the source directories
foreach(SUBDIR ${THIS_PROJECT_SRCDIRS})
@@ -174,12 +179,15 @@
# TODO: STLport rather than default library
# TODO: STLport's deprecated iostreams
- # Add -debug for debug libraries only if BUILD_RELEASE is ON
+ # Add -debug for debug libraries
list_contains(VARIANT_IS_DEBUG DEBUG ${ARGN})
- if (VARIANT_IS_DEBUG AND BUILD_RELEASE)
- set(VARIANT_TARGET_NAME "${VARIANT_TARGET_NAME}-debug")
+ if (VARIANT_IS_DEBUG)
+ # Only add the actual "-debug" if we're also building release libraries
+ if (BUILD_RELEASE)
+ set(VARIANT_TARGET_NAME "${VARIANT_TARGET_NAME}-debug")
+ endif (BUILD_RELEASE)
set(VARIANT_ABI_TAG "${VARIANT_ABI_TAG}d")
- endif (VARIANT_IS_DEBUG AND BUILD_RELEASE)
+ endif (VARIANT_IS_DEBUG)
# If there is an ABI tag, append it to the versioned name
if (VARIANT_ABI_TAG)
@@ -196,6 +204,54 @@
endif(BOOST_VERSION_SUBMINOR GREATER 0)
endmacro(boost_library_variant_target_name)
+# This macro is an internal utility macro that updates compilation and
+# linking flags based on interactions among the features in a variant.
+#
+# boost_feature_interactions(prefix
+# feature1 feature2 ...)
+#
+# where "prefix" is the prefix of the compilation and linking flags
+# that will be updated (e.g., ${prefix}_COMPILE_FLAGS). feature1,
+# feature2, etc. are the names of the features used in this particular
+# variant. If the features in this variant conflict, set
+# ${prefix}_OKAY to FALSE.
+macro(boost_feature_interactions PREFIX)
+ # Don't build or link against a shared library and a static run-time
+ list_contains(IS_SHARED SHARED ${ARGN})
+ list_contains(IS_STATIC_RUNTIME STATIC_RUNTIME ${ARGN})
+ if (IS_SHARED AND IS_STATIC_RUNTIME)
+ set(${PREFIX}_OKAY FALSE)
+ endif (IS_SHARED AND IS_STATIC_RUNTIME)
+
+ # With Visual C++, the dynamic runtime is multi-threaded only
+ if (MSVC)
+ list_contains(IS_DYNAMIC_RUNTIME DYNAMIC_RUNTIME ${ARGN})
+ list_contains(IS_SINGLE_THREADED SINGLE_THREADED ${ARGN})
+ if (IS_DYNAMIC_RUNTIME AND IS_SINGLE_THREADED)
+ set(${PREFIX}_OKAY FALSE)
+ endif (IS_DYNAMIC_RUNTIME AND IS_SINGLE_THREADED)
+ endif (MSVC)
+
+ # Visual C++-specific runtime library flags
+ if(MSVC)
+ list_contains(IS_STATIC_RUNTIME STATIC_RUNTIME ${ARGN})
+ list_contains(IS_DEBUG DEBUG ${ARGN})
+ if(IS_DEBUG)
+ if(IS_STATIC_RUNTIME)
+ set(${PREFIX}_COMPILE_FLAGS "/MTd ${${PREFIX}_COMPILE_FLAGS}")
+ else(IS_STATIC_RUNTIME)
+ set(${PREFIX}_COMPILE_FLAGS "/MDd ${${PREFIX}_COMPILE_FLAGS}")
+ endif(IS_STATIC_RUNTIME)
+ else(IS_DEBUG)
+ if(IS_STATIC_RUNTIME)
+ set(${PREFIX}_COMPILE_FLAGS "/MT ${${PREFIX}_COMPILE_FLAGS}")
+ else(IS_STATIC_RUNTIME)
+ set(${PREFIX}_COMPILE_FLAGS "/MD ${${PREFIX}_COMPILE_FLAGS}")
+ endif(IS_STATIC_RUNTIME)
+ endif(IS_DEBUG)
+ endif(MSVC)
+endmacro(boost_feature_interactions)
+
# This macro is an internal utility macro that builds a particular
# variant of a boost library.
#
@@ -246,40 +302,8 @@
set(THIS_VARIANT_LINK_LIBS ${THIS_VARIANT_LINK_LIBS} ${THIS_LIB_${ARG}_LINK_LIBS} ${${ARG}_LINK_LIBS})
endforeach(ARG ${ARGN})
- # Don't build a shared library against a static run-time
- list_contains(IS_SHARED SHARED ${ARGN})
- list_contains(IS_STATIC_RUNTIME STATIC_RUNTIME ${ARGN})
- if (IS_SHARED AND IS_STATIC_RUNTIME)
- set(THIS_VARIANT_OKAY FALSE)
- endif (IS_SHARED AND IS_STATIC_RUNTIME)
-
- # With Visual C++, the dynamic runtime is multi-threaded only
- if (MSVC)
- list_contains(IS_DYNAMIC_RUNTIME DYNAMIC_RUNTIME ${ARGN})
- list_contains(IS_SINGLE_THREADED SINGLE_THREADED ${ARGN})
- if (IS_DYNAMIC_RUNTIME AND IS_SINGLE_THREADED)
- set(THIS_VARIANT_OKAY FALSE)
- endif (IS_DYNAMIC_RUNTIME AND IS_SINGLE_THREADED)
- endif (MSVC)
-
- # Visual C++-specific runtime library flags
- if(MSVC)
- list_contains(IS_STATIC_RUNTIME STATIC_RUNTIME ${ARGN})
- list_contains(IS_DEBUG DEBUG ${ARGN})
- if(IS_DEBUG)
- if(IS_STATIC_RUNTIME)
- set(THIS_VARIANT_COMPILE_FLAGS "/MTd ${THIS_VARIANT_COMPILE_FLAGS}")
- else(IS_STATIC_RUNTIME)
- set(THIS_VARIANT_COMPILE_FLAGS "/MDd ${THIS_VARIANT_COMPILE_FLAGS}")
- endif(IS_STATIC_RUNTIME)
- else(IS_DEBUG)
- if(IS_STATIC_RUNTIME)
- set(THIS_VARIANT_COMPILE_FLAGS "/MT ${THIS_VARIANT_COMPILE_FLAGS}")
- else(IS_STATIC_RUNTIME)
- set(THIS_VARIANT_COMPILE_FLAGS "/MD ${THIS_VARIANT_COMPILE_FLAGS}")
- endif(IS_STATIC_RUNTIME)
- endif(IS_DEBUG)
- endif(MSVC)
+ # Handle feature interactions
+ boost_feature_interactions("THIS_VARIANT" ${ARGN})
if (THIS_VARIANT_OKAY)
# Determine the suffix for this library target
@@ -385,9 +409,16 @@
# naming a specific set of features for that variant, e.g.,
# STATIC:DEBUG:SINGLE_THREADED.
#
-# BOOST_ADDLIB_ARG_NAMES:
+# BOOST_FEATURES:
+# This variable describes all of the feature sets that we know about,
+# and will be extended each time ither boost_add_default_variant or
+# boost_add_extra_variant is invoked. This macro will contain a list
+# of feature sets, each containing the values for a given feature
+# separated by colons, e.g., "DEBUG:RELEASE".
+#
+# BOOST_ADD_ARG_NAMES:
# This variable describes all of the feature-specific arguments
-# that can be used for the boost_library macro, separated by
+# that can be used for the boost_add_library macro, separated by
# semicolons. For example, given the use of
# boost_add_default_variant above, this variable will contain (at
# least)
@@ -395,17 +426,25 @@
# SINGLE_THREADED_COMPILE_FLAGS;SINGLE_THREADED_LINK_FLAGS;
# MULTI_THREADED_COMPILE_FLAGS;MULTI_THREADED_LINK_FLAGS
#
-# When this variable is used in boost_library, it turns these
+# When this variable is used in boost_add_library, it turns these
# names into feature-specific options. For example,
# MULTI_THREADED_COMPILE_FLAGS provides extra compile flags to be
# used only for multi-threaded variants of the library.
#
# BOOST_ADDLIB_OPTION_NAMES:
-# Like BOOST_ADDLIB_ARG_NAMES, this variable describes
+# Like BOOST_ADD_ARG_NAMES, this variable describes
# feature-specific options to boost_library that can be used to
# turn off building of the library when the variant would require
# certain features. For example, the NO_SINGLE_THREADED option
# turns off building of single-threaded variants for a library.
+#
+# BOOST_ADDEXE_OPTION_NAMES:
+# Like BOOST_ADDLIB_OPTION_NAMES, execept that that variable
+# describes options to boost_add_executable that can be used to
+# describe which features are needed to build the executable.
+# For example, the MULTI_THREADED option requires that the
+# executable be built against multi-threaded libraries and with
+# multi-threaded options.
macro(boost_add_default_variant)
# Update BOOST_DEFAULT_VARIANTS
if (BOOST_DEFAULT_VARIANTS)
@@ -421,12 +460,21 @@
set(BOOST_DEFAULT_VARIANTS ${ARGN})
endif (BOOST_DEFAULT_VARIANTS)
- # Feature flag options, used by the boost_library macro
+ # Set Feature flag options used by the boost_library macro and the
+ # BOOST_FEATURES variable
+ set(BOOST_DEFVAR_FEATURES)
foreach(FEATURE ${ARGN})
- set(BOOST_ADDLIB_ARG_NAMES
- "${BOOST_ADDLIB_ARG_NAMES};${FEATURE}_COMPILE_FLAGS;${FEATURE}_LINK_FLAGS;${FEATURE}_LINK_LIBS")
+ set(BOOST_ADD_ARG_NAMES
+ "${BOOST_ADD_ARG_NAMES};${FEATURE}_COMPILE_FLAGS;${FEATURE}_LINK_FLAGS;${FEATURE}_LINK_LIBS")
set(BOOST_ADDLIB_OPTION_NAMES "${BOOST_ADDLIB_OPTION_NAMES};NO_${FEATURE}")
+ set(BOOST_ADDEXE_OPTION_NAMES "${BOOST_ADDEXE_OPTION_NAMES};${FEATURE}")
+ if (BOOST_DEFVAR_FEATURES)
+ set(BOOST_DEFVAR_FEATURES "${BOOST_DEFVAR_FEATURES}:${FEATURE}")
+ else (BOOST_DEFVAR_FEATURES)
+ set(BOOST_DEFVAR_FEATURES "${FEATURE}")
+ endif (BOOST_DEFVAR_FEATURES)
endforeach(FEATURE ${ARGN})
+ list(APPEND BOOST_FEATURES ${BOOST_DEFVAR_FEATURES})
endmacro(boost_add_default_variant)
# Updates the set of "extra" build variants, which may be used to
@@ -453,17 +501,31 @@
#
# Variables affected:
#
-# BOOST_ADDLIB_ARG_NAMES:
+# BOOST_FEATURES:
+# See boost_add_default_variant.
+#
+# BOOST_ADD_ARG_NAMES:
# See boost_add_default_variant.
#
# BOOST_ADDLIB_OPTION_NAMES:
# See boost_add_default_variant.
+#
+# BOOST_ADDEXE_OPTION_NAMES:
+# See boost_add_default_variant.
macro(boost_add_extra_variant)
+ set(BOOST_EXTVAR_FEATURES)
foreach(FEATURE ${ARGN})
- set(BOOST_ADDLIB_ARG_NAMES
- "${BOOST_ADDLIB_ARG_NAMES};${FEATURE}_COMPILE_FLAGS;${FEATURE}_LINK_FLAGS;${FEATURE}_LINK_LIBS")
+ set(BOOST_ADD_ARG_NAMES
+ "${BOOST_ADD_ARG_NAMES};${FEATURE}_COMPILE_FLAGS;${FEATURE}_LINK_FLAGS;${FEATURE}_LINK_LIBS")
set(BOOST_ADDLIB_OPTION_NAMES "${BOOST_ADDLIB_OPTION_NAMES};NO_${FEATURE}")
+ set(BOOST_ADDEXE_OPTION_NAMES "${BOOST_ADDEXE_OPTION_NAMES};${FEATURE}")
+ if (BOOST_EXTVAR_FEATURES)
+ set(BOOST_EXTVAR_FEATURES "${BOOST_EXTVAR_FEATURES}:${FEATURE}")
+ else (BOOST_EXTVAR_FEATURES)
+ set(BOOST_EXTVAR_FEATURES "${FEATURE}")
+ endif (BOOST_EXTVAR_FEATURES)
endforeach(FEATURE ${ARGN})
+ list(APPEND BOOST_FEATURES ${BOOST_EXTVAR_FEATURES})
endmacro(boost_add_extra_variant)
# Creates a new Boost library target that generates a compiled library
@@ -537,7 +599,7 @@
# MULTI_THREADED_LINK_LIBS provides extra libraries to link into
# multi-threaded variants of the library.
#
-# DEPENDS: States that this Boost libraries depends on and links
+# DEPENDS: States that this Boost library depends on and links
# against another Boost library. The arguments to DEPENDS should be
# the unversioned name of the Boost library, such as
# "boost_filesystem". Like LINK_LIBS, this option states that all
@@ -589,7 +651,7 @@
# )
macro(boost_add_library LIBNAME)
parse_arguments(THIS_LIB
- "DEPENDS;COMPILE_FLAGS;LINK_FLAGS;LINK_LIBS;EXTRA_VARIANTS;${BOOST_ADDLIB_ARG_NAMES}"
+ "DEPENDS;COMPILE_FLAGS;LINK_FLAGS;LINK_LIBS;EXTRA_VARIANTS;${BOOST_ADD_ARG_NAMES}"
"STATIC_TAG;MODULE;${BOOST_ADDLIB_OPTION_NAMES}"
${ARGN}
)
@@ -623,4 +685,224 @@
endforeach(VARIANT_STR ${THIS_LIB_VARIANTS})
endmacro(boost_add_library)
-# TODO: Create boost_add_executable, which deals with variants well
\ No newline at end of file
+# Creates a new executable from source files.
+#
+# boost_add_executable(exename
+# source1 source2 ...
+# [COMPILE_FLAGS compileflags]
+# [feature_COMPILE_FLAGS compileflags]
+# [LINK_FLAGS linkflags]
+# [feature_LINK_FLAGS linkflags]
+# [LINK_LIBS linklibs]
+# [feature_LINK_LIBS linklibs]
+# [DEPENDS libdepend1 libdepend2 ...]
+# [feature]
+# [NO_INSTALL])
+#
+# where exename is the name of the executable (e.g., "wave") source1,
+# source2, etc. are the source files used to build the library, e.g.,
+# cpp.cpp. If no source files are provided, "exename.cpp" will be
+# used.
+#
+# This macro has a variety of options that affect its behavior. In
+# several cases, we use the placeholder "feature" in the option name
+# to indicate that there are actually several different kinds of
+# options, each referring to a different build feature, e.g., shared
+# libraries, multi-threaded, debug build, etc. For a complete listing
+# of these features, please refer to the CMakeLists.txt file in the
+# root of the Boost distribution, which defines the set of features
+# that will be used to build Boost libraries by default.
+#
+# The options that affect this macro's behavior are:
+#
+# COMPILE_FLAGS: Provides additional compilation flags that will be
+# used when building the executable.
+#
+# feature_COMPILE_FLAGS: Provides additional compilation flags that
+# will be used only when building the executable with the given
+# feature (e.g., SHARED_COMPILE_FLAGS when we're linking against
+# shared libraries). Note that the set of features used to build the
+# executable depends both on the arguments given to
+# boost_add_executable (see the "feature" argument description,
+# below) and on the user's choice of variants to build.
+#
+# LINK_FLAGS: Provides additional flags that will be passed to the
+# linker when linking the executable. This option should not be used
+# to link in additional libraries; see LINK_LIBS and DEPENDS.
+#
+# feature_LINK_FLAGS: Provides additional flags that will be passed
+# to the linker when linking the executable with the given feature
+# (e.g., MULTI_THREADED_LINK_FLAGS when we're linking a
+# multi-threaded executable).
+#
+# LINK_LIBS: Provides additional libraries against which the
+# executable will be linked. For example, one might provide "expat"
+# as options to LINK_LIBS, to state that the executable will link
+# against the expat library binary. Use LINK_LIBS for libraries
+# external to Boost; for Boost libraries, use DEPENDS.
+#
+# feature_LINK_LIBS: Provides additional libraries to link against
+# when linking an executable built with the given feature.
+#
+# DEPENDS: States that this executable depends on and links against
+# a Boostlibrary. The arguments to DEPENDS should be the unversioned
+# name of the Boost library, such as "boost_filesystem". Like
+# LINK_LIBS, this option states that the executable will link
+# against the stated libraries. Unlike LINK_LIBS, however, DEPENDS
+# takes particular library variants into account, always linking to
+# the appropriate variant of one Boost library. For example, if the
+# MULTI_THREADED feature was requested in the call to
+# boost_add_executable, DEPENDS will ensure that we only link
+# against multi-threaded libraries.
+#
+# feature: States that the executable should always be built using a
+# given feature, e.g., SHARED linking (against its libraries) or
+# MULTI_THREADED (for multi-threaded builds). If that feature has
+# been turned off by the user, the executable will not build.
+#
+# NO_INSTALL: Don't install this executable with the rest of Boost.
+#
+# OUTPUT_NAME: If you want the executable to be generated somewhere
+# other than the binary directory, pass the path (including
+# directory and file name) via the OUTPUT_NAME parameter.
+#
+# Example:
+# boost_add_executable(wave cpp.cpp
+# DEPENDS boost_wave boost_program_options boost_filesystem
+# boost_serialization
+# )
+macro(boost_add_executable EXENAME)
+ # Note: ARGS is here to support the use of boost_add_executable in
+ # the testing code.
+ parse_arguments(THIS_EXE
+ "DEPENDS;COMPILE_FLAGS;LINK_FLAGS;LINK_LIBS;OUTPUT_NAME;ARGS;${BOOST_ADD_ARG_NAMES}"
+ "NO_INSTALL;${BOOST_ADDEXE_OPTION_NAMES}"
+ ${ARGN}
+ )
+
+ # Determine the list of sources
+ if (THIS_EXE_DEFAULT_ARGS)
+ set(THIS_EXE_SOURCES ${THIS_EXE_DEFAULT_ARGS})
+ else (THIS_EXE_DEFAULT_ARGS)
+ set(THIS_EXE_SOURCES ${EXENAME}.cpp)
+ endif (THIS_EXE_DEFAULT_ARGS)
+
+ # Compute the variant that will be used to build this executable,
+ # taking into account both the requested features passed to
+ # boost_add_executable and what options the user has set.
+ set(THIS_EXE_OKAY TRUE)
+ set(THIS_EXE_VARIANT)
+ foreach(FEATURESET_STR ${BOOST_FEATURES})
+ string(REPLACE ":" ";" FEATURESET ${FEATURESET_STR})
+ separate_arguments(FEATURESET)
+ set(THIS_EXE_REQUESTED_FROM_SET FALSE)
+ foreach (FEATURE ${FEATURESET})
+ if (THIS_EXE_${FEATURE})
+ # Make this feature part of the variant
+ list(APPEND THIS_EXE_VARIANT ${FEATURE})
+ set(THIS_EXE_REQUESTED_FROM_SET TRUE)
+
+ # The caller has requested this particular feature be used
+ # when building the executable. If we can't satisfy that
+ # request (because the user has turned off the build variants
+ # with that feature), then we won't build this executable.
+ if (NOT BUILD_${FEATURE})
+ set(THIS_EXE_OKAY FALSE)
+ endif (NOT BUILD_${FEATURE})
+ endif (THIS_EXE_${FEATURE})
+ endforeach (FEATURE ${FEATURESET})
+
+ if (NOT THIS_EXE_REQUESTED_FROM_SET)
+ # The caller did not specify which feature value to use from
+ # this set, so find the first feature value that actually works.
+ set(THIS_EXE_FOUND_FEATURE FALSE)
+ foreach (FEATURE ${FEATURESET})
+ # We only care about the first feature value we find...
+ if (NOT THIS_EXE_FOUND_FEATURE)
+ # Are we allowed to build this feature?
+ if (BUILD_${FEATURE})
+ # Found it: we're done
+ list(APPEND THIS_EXE_VARIANT ${FEATURE})
+ set(THIS_EXE_FOUND_FEATURE TRUE)
+ endif (BUILD_${FEATURE})
+ endif (NOT THIS_EXE_FOUND_FEATURE)
+ endforeach (FEATURE ${FEATURESET})
+
+ if (NOT THIS_EXE_FOUND_FEATURE)
+ # All of the features in this set were turned off.
+ # Just don't build anything.
+ set(THIS_EXE_OKAY FALSE)
+ endif (NOT THIS_EXE_FOUND_FEATURE)
+ endif (NOT THIS_EXE_REQUESTED_FROM_SET)
+ endforeach(FEATURESET_STR ${BOOST_FEATURES})
+
+ # Propagate flags from each of the features
+ if (THIS_EXE_OKAY)
+ foreach (FEATURE ${THIS_EXE_VARIANT})
+ # Add all of the flags for this feature
+ set(THIS_EXE_COMPILE_FLAGS
+ "${THIS_EXE_COMPILE_FLAGS} ${THIS_EXE_${FEATURE}_COMPILE_FLAGS} ${${FEATURE}_COMPILE_FLAGS}")
+ set(THIS_EXE_LINK_FLAGS
+ "${THIS_EXE_LINK_FLAGS} ${THIS_EXE_${FEATURE}_LINK_FLAGS} ${${FEATURE}_LINK_FLAGS}")
+ set(THIS_EXE_LINK_LIBS
+ ${THIS_EXE_LINK_LIBS} ${THIS_EXE_${FEATURE}_LINK_LIBS} ${${FEATURE}_LINK_LIBS})
+ endforeach (FEATURE ${THIS_EXE_VARIANT})
+
+ # Handle feature interactions
+ boost_feature_interactions("THIS_EXE" ${THIS_EXE_VARIANT})
+ endif (THIS_EXE_OKAY)
+
+ if (THIS_EXE_OKAY)
+ # Compute the name of the variant targets that we'll be linking
+ # against. We'll use this to link against the appropriate
+ # dependencies.
+ boost_library_variant_target_name(${THIS_EXE_VARIANT})
+
+ # Compute the actual set of library dependencies, based on the
+ # variant name we computed above.
+ set(THIS_EXE_ACTUAL_DEPENDS)
+ foreach(LIB ${THIS_EXE_DEPENDS})
+ if (LIB MATCHES ".*-.*")
+ # The user tried to state exactly which variant to use. Just
+ # propagate the dependency and hope that s/he was
+ # right. Eventually, this should at least warn, because it is
+ # not the "proper" way to do things
+ list(APPEND THIS_EXE_ACTUAL_DEPENDS ${LIB})
+ else (LIB MATCHES ".*-.*")
+ # The user has given the name of just the library target,
+ # e.g., "boost_filesystem". We add on the appropriate variant
+ # name.
+ list(APPEND THIS_EXE_ACTUAL_DEPENDS "${LIB}${VARIANT_TARGET_NAME}")
+ endif (LIB MATCHES ".*-.*")
+ endforeach(LIB ${THIS_EXE_DEPENDS})
+
+ # Build the executable
+ add_executable(${EXENAME} ${THIS_EXE_SOURCES})
+
+ # Set the various properties we need
+ # TODO: For Visual Studio, set _DEBUG and _RELEASE versions
+ set_target_properties(${EXENAME}
+ PROPERTIES
+ COMPILE_FLAGS "${THIS_EXE_COMPILE_FLAGS}"
+ LINK_FLAGS "${THIS_EXE_LINK_FLAGS}"
+ )
+
+ # If the user gave an output name, use it.
+ if (THIS_EXE_OUTPUT_NAME)
+ set_target_properties(${EXENAME}
+ PROPERTIES
+ OUTPUT_NAME "${THIS_EXE_OUTPUT_NAME}"
+ )
+ endif (THIS_EXE_OUTPUT_NAME)
+
+ # Link against the various libraries
+ target_link_libraries(${EXENAME}
+ ${THIS_EXE_ACTUAL_DEPENDS}
+ ${THIS_EXE_LINK_LIBS})
+
+ # Install the executable, if not suppressed
+ if (NOT THIS_EXE_NO_INSTALL)
+ install(TARGETS ${EXENAME} DESTINATION bin)
+ endif (NOT THIS_EXE_NO_INSTALL)
+ endif (THIS_EXE_OKAY)
+endmacro(boost_add_executable)
\ No newline at end of file
Modified: sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostTesting.cmake
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostTesting.cmake (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/BoostTesting.cmake 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -161,19 +161,16 @@
# best library variant available to meet those features and the
# current build variant (Debug or Release).
macro(boost_test_run testname)
- boost_test_parse_args(${testname} ${ARGN})
- if (BOOST_TEST_OKAY)
- add_executable(${testname} ${BOOST_TEST_SOURCES})
- set_target_properties(${testname}
- PROPERTIES
- COMPILE_FLAGS "${BOOST_TEST_COMPILE_FLAGS}"
- LINK_FLAGS "${BOOST_TEST_LINK_FLAGS}"
- OUTPUT_NAME ${PROJECT_NAME}/${testname})
- target_link_libraries(${testname} ${BOOST_TEST_DEPENDS})
- target_link_libraries(${testname} ${BOOST_TEST_LINK_LIBS})
- add_test("${PROJECT_NAME}::${testname}"
- ${EXECUTABLE_OUTPUT_PATH}/${PROJECT_NAME}/${testname} ${BOOST_TEST_ARGS})
- endif(BOOST_TEST_OKAY)
+ if (BUILD_TESTING)
+ boost_add_executable(${testname} ${ARGN}
+ OUTPUT_NAME tests/${PROJECT_NAME}/${testname}
+ NO_INSTALL)
+ if (THIS_EXE_OKAY)
+ add_test("${PROJECT_NAME}::${testname}"
+ ${EXECUTABLE_OUTPUT_PATH}/tests/${PROJECT_NAME}/${testname}
+ ${THIS_EXE_ARGS})
+ endif (THIS_EXE_OKAY)
+ endif(BUILD_TESTING)
endmacro(boost_test_run)
# This macro creates a Boost regression test that will be executed. If
@@ -230,21 +227,18 @@
# best library variant available to meet those features and the
# current build variant (Debug or Release).
macro(boost_test_run_fail testname)
- boost_test_parse_args(${testname} ${ARGN})
- if(BOOST_TEST_OKAY)
- add_executable(${testname} ${BOOST_TEST_SOURCES})
- set_target_properties(${testname}
- PROPERTIES
- COMPILE_FLAGS "${BOOST_TEST_COMPILE_FLAGS}"
- LINK_FLAGS "${BOOST_TEST_LINK_FLAGS}"
- OUTPUT_NAME ${PROJECT_NAME}/${testname})
- target_link_libraries(${testname} ${BOOST_TEST_DEPENDS})
- target_link_libraries(${testname} ${BOOST_TEST_LINK_LIBS})
- add_test("${PROJECT_NAME}::${testname}"
- ${EXECUTABLE_OUTPUT_PATH}/${PROJECT_NAME}/${testname} ${BOOST_TEST_ARGS})
- set_tests_properties("${PROJECT_NAME}::${testname}"
- PROPERTIES WILL_FAIL TRUE)
- endif(BOOST_TEST_OKAY)
+ if (BUILD_TESTING)
+ boost_add_executable(${testname} ${ARGN}
+ OUTPUT_NAME tests/${PROJECT_NAME}/${testname}
+ NO_INSTALL)
+ if (THIS_EXE_OKAY)
+ add_test("${PROJECT_NAME}::${testname}"
+ ${EXECUTABLE_OUTPUT_PATH}/tests/${PROJECT_NAME}/${testname}
+ ${THIS_EXE_ARGS})
+ set_tests_properties("${PROJECT_NAME}::${testname}"
+ PROPERTIES WILL_FAIL TRUE)
+ endif (THIS_EXE_OKAY)
+ endif(BUILD_TESTING)
endmacro(boost_test_run_fail)
# Under construction...
Added: sandbox-branches/boost-cmake/boost_1_34_0/tools/quickbook/CMakeLists.txt
==============================================================================
--- (empty file)
+++ sandbox-branches/boost-cmake/boost_1_34_0/tools/quickbook/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -0,0 +1,11 @@
+if (MSVC)
+ add_definitions(/wd4511 /wd4512 /wd4701 /wd4702 /wd4244 /wd4267 /wd4800)
+endif (MSVC)
+
+boost_add_executable(quickbook
+ detail/quickbook.cpp
+ detail/actions.cpp
+ detail/utils.cpp
+ detail/post_process.cpp
+ DEPENDS boost_program_options boost_filesystem
+ )
Added: sandbox-branches/boost-cmake/boost_1_34_0/tools/wave/CMakeLists.txt
==============================================================================
--- (empty file)
+++ sandbox-branches/boost-cmake/boost_1_34_0/tools/wave/CMakeLists.txt 2007-06-18 06:52:10 EDT (Mon, 18 Jun 2007)
@@ -0,0 +1,3 @@
+boost_add_executable(wave cpp.cpp
+ DEPENDS boost_wave boost_program_options boost_filesystem boost_serialization
+ )
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