|
|
Boost-Commit : |
From: troy_at_[hidden]
Date: 2007-06-05 15:47:45
Author: troy
Date: 2007-06-05 15:47:41 EDT (Tue, 05 Jun 2007)
New Revision: 4457
URL: http://svn.boost.org/trac/boost/changeset/4457
Log:
Big commit:
add LINK_LIBS flags which adds libs to the link line, generally and per-variant.
make general COMPILE_FLAGS and LINK_FLAGS work (that apply to all
variants)
Text files modified:
sandbox-branches/boost-cmake/boost_1_34_0/libs/config/test/CMakeLists.txt | 19 ++++++++++---------
sandbox-branches/boost-cmake/boost_1_34_0/libs/date_time/test/CMakeLists.txt | 32 ++++++++++++++++----------------
sandbox-branches/boost-cmake/boost_1_34_0/libs/graph/src/CMakeLists.txt | 2 +-
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 | 5 +++--
sandbox-branches/boost-cmake/boost_1_34_0/libs/iostreams/src/CMakeLists.txt | 2 +-
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/mpl/test/apply.cpp | 5 -----
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 | 4 ++--
sandbox-branches/boost-cmake/boost_1_34_0/libs/ptr_container/test/CMakeLists.txt | 28 ++++++++++++++--------------
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/src/CMakeLists.txt | 2 +-
sandbox-branches/boost-cmake/boost_1_34_0/libs/serialization/test/CMakeLists.txt | 4 ++--
sandbox-branches/boost-cmake/boost_1_34_0/libs/tokenizer/test/CMakeLists.txt | 2 +-
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 | 2 +-
sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/boost-core.cmake | 17 +++++++++++------
sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/boost-testing.cmake | 6 +++---
25 files changed, 134 insertions(+), 132 deletions(-)
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-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -36,17 +36,18 @@
boost_test_run(math_info)
-if(CMAKE_SYSTEM_NAME MATCHES "Linux")
- set(threadlibs "LIBRARIES;pthread;rt")
-endif(CMAKE_SYSTEM_NAME MATCHES "Linux")
+# if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+# set(threadlibs "LIBRARIES;pthread;rt")
+# endif(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
+# these aren't really tests anyway
+#set(tests_need_threadlibs config_test has_clock_gettime_pass has_pthread_ma_st_pass has_pthread_yield_pass)
+#foreach(test ${tests_need_threadlibs})
+# boost_test_run(${test})
+#endforeach(test ${tests_need_threadlibs})
-set(tests_need_threadlibs config_test has_clock_gettime_pass has_pthread_ma_st_pass has_pthread_yield_pass)
-foreach(test ${tests_need_threadlibs})
- boost_test_run(${test} ${threadlibs})
-endforeach(test ${tests_need_threadlibs})
-
-boost_test_run(limits_test LIBRARIES boost_test_exec_monitor-static)
+boost_test_run(limits_test DEPENDS boost_test_exec_monitor-static)
boost_test_run(abi_test SOURCES 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/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-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -16,7 +16,7 @@
macro(date_time_static_test SUBDIR TESTNAME)
boost_test_run(${TESTNAME}
SOURCES "${SUBDIR}/${TESTNAME}.cpp"
- LIBRARIES 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"
SOURCES "${SUBDIR}/${TESTNAME}.cpp"
- LIBRARIES 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
SOURCES "gregorian/testgreg_wstream.cpp"
- LIBRARIES 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
SOURCES "posix_time/testtime_wstream.cpp"
- LIBRARIES 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
SOURCES "gregorian/testfacet.cpp"
- LIBRARIES 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
SOURCES "gregorian/testparse_date.cpp"
- LIBRARIES 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
SOURCES "gregorian/testfacet.cpp"
- LIBRARIES 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
SOURCES "gregorian/testparse_date.cpp"
- LIBRARIES 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
SOURCES "posix_time/teststreams.cpp"
- LIBRARIES 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
SOURCES "gregorian/testgreg_serialize.cpp"
- LIBRARIES boost_date_time-static boost_serialization-static
+ DEPENDS boost_date_time-static boost_serialization-static
COMPILE_FLAGS "${DATE_TIME_COMPILE_FLAGS} -DDATE_TIME_XML_SERIALIZE")
boost_test_run(testtime_serialize_xml_std_config
SOURCES "posix_time/testtime_serialize.cpp"
- LIBRARIES boost_date_time-static boost_serialization-static
+ DEPENDS boost_date_time-static 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
SOURCES "posix_time/testtime_serialize.cpp"
- LIBRARIES boost_date_time-static boost_serialization-static
+ DEPENDS boost_date_time-static boost_serialization-static
COMPILE_FLAGS "${DATE_TIME_COMPILE_FLAGS} -DDATE_TIME_XML_SERIALIZE")
# text archive tests
boost_test_run(testgreg_serialize
SOURCES "gregorian/testgreg_serialize.cpp"
- LIBRARIES boost_date_time-static boost_serialization-static
+ DEPENDS boost_date_time-static boost_serialization-static
COMPILE_FLAGS "${DATE_TIME_COMPILE_FLAGS}")
boost_test_run(testgreg_serialize_dll
SOURCES "gregorian/testgreg_serialize.cpp"
- LIBRARIES 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
SOURCES "posix_time/testtime_serialize.cpp"
- LIBRARIES boost_date_time-static boost_serialization-static
+ DEPENDS boost_date_time-static boost_serialization-static
COMPILE_FLAGS "${DATE_TIME_COMPILE_FLAGS} -DBOOST_DATE_TIME_POSIX_TIME_STD_CONFIG")
boost_test_run(testtime_serialize
SOURCES "posix_time/testtime_serialize.cpp"
- LIBRARIES boost_date_time-static boost_serialization-static
+ DEPENDS boost_date_time-static boost_serialization-static
COMPILE_FLAGS "${DATE_TIME_COMPILE_FLAGS}")
# Copyright (c) 2000-2005
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-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -22,6 +22,6 @@
boost_library(
boost_graph
read_graphviz_spirit.cpp ${BOOST_GRAPH_OPTIONAL_SOURCES}
- LIBRARIES "${BOOST_GRAPH_OPTIONAL_LIBRARIES}"
+ LINK_LIBS ${BOOST_GRAPH_OPTIONAL_LIBRARIES}
SHARED_COMPILE_FLAGS "-DBOOST_GRAPH_DYN_LINK=1"
)
\ No newline at end of file
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-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -1,4 +1,4 @@
boost_test_run(cstdint_test SOURCES ../cstdint_test.cpp)
boost_test_run(integer_test SOURCES ../integer_test.cpp)
boost_test_run(integer_traits_test SOURCES ../integer_traits_test.cpp
- LIBRARIES boost_test_exec_monitor-static)
\ No newline at end of file
+ DEPENDS boost_test_exec_monitor-static)
\ No newline at end of file
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-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -1,2 +1,3 @@
-boost_test_run(ios_state_unit_test LIBRARIES boost_unit_test_framework-static)
-boost_test_run(ios_state_test LIBRARIES boost_test_exec_monitor-static)
\ No newline at end of file
+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)
+
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/iostreams/src/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/iostreams/src/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/iostreams/src/CMakeLists.txt 2007-06-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -28,5 +28,5 @@
boost_library(boost_iostreams
file_descriptor.cpp mapped_file.cpp ${BOOST_IOSTREAMS_EXTRA_SOURCES}
- LIBRARIES "${BOOST_IOSTREAMS_LIBRARIES}"
+ LINK_LIBS "${BOOST_IOSTREAMS_LIBRARIES}"
SHARED_COMPILE_FLAGS "-DBOOST_IOSTREAMS_DYN_LINK=1")
\ No newline at end of file
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-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -2,7 +2,7 @@
macro(iostreams_test TESTNAME)
boost_test_run(${TESTNAME}
${ARGN}
- LIBRARIES boost_unit_test_framework-static
+ DEPENDS boost_unit_test_framework-static
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
- LIBRARIES boost_unit_test_framework-static boost_iostreams-static
+ DEPENDS boost_unit_test_framework-static boost_iostreams-static
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
- LIBRARIES boost_unit_test_framework-static boost_iostreams-static
+ DEPENDS boost_unit_test_framework-static boost_iostreams-static
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
- LIBRARIES boost_unit_test_framework-static boost_regex-static
+ DEPENDS boost_unit_test_framework-static boost_regex-static
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
- LIBRARIES boost_unit_test_framework-static boost_iostreams-static
+ DEPENDS boost_unit_test_framework-static boost_iostreams-static
COMPILE_FLAGS "-DBOOST_IOSTREAMS_NO_LIB")
boost_test_run(zlib_test
- LIBRARIES boost_unit_test_framework-static boost_iostreams-static
+ DEPENDS boost_unit_test_framework-static boost_iostreams-static
COMPILE_FLAGS "-DBOOST_IOSTREAMS_NO_LIB")
endif(ZLIB_FOUND)
@@ -61,6 +61,6 @@
include(FindBZip2)
if (BZIP2_FOUND)
boost_test_run(bzip2_test
- LIBRARIES boost_unit_test_framework-static boost_iostreams-static
+ DEPENDS boost_unit_test_framework-static boost_iostreams-static
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-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -1,16 +1,16 @@
-boost_test_run(algorithm_test LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(bind_tests_simple LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(bind_tests_advanced LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(bind_tests_simple_f_refs LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(bll_and_function LIBRARIES boost_test_exec_monitor-static)
+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(lambda_cast_test
- SOURCES cast_test.cpp LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(constructor_tests LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(control_structures LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(exception_test LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(extending_rt_traits LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(is_instance_of_test LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(member_pointer_test LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(operator_tests_simple LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(phoenix_control_structures LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(switch_construct LIBRARIES boost_test_exec_monitor-static)
+ SOURCES 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)
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-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -1,18 +1,18 @@
-boost_test_run(common_factor_test LIBRARIES boost_unit_test_framework-static)
+boost_test_run(common_factor_test DEPENDS boost_unit_test_framework-static)
boost_test_run(octonion_test
SOURCES ../octonion/octonion_test.cpp
- LIBRARIES boost_unit_test_framework-static)
+ DEPENDS boost_unit_test_framework-static)
boost_test_run(quaternion_test
SOURCES ../quaternion/quaternion_test.cpp
- LIBRARIES boost_unit_test_framework-static)
+ DEPENDS boost_unit_test_framework-static)
boost_test_run(special_functions_test
SOURCES ../special_functions/special_functions_test.cpp
- LIBRARIES boost_unit_test_framework-static)
+ DEPENDS boost_unit_test_framework-static)
boost_test_run(quaternion_multi_incl_test
SOURCES ../quaternion/quaternion_mult_incl_test.cpp
../quaternion/quaternion_mi1.cpp
../quaternion/quaternion_mi2.cpp
- LIBRARIES boost_unit_test_framework-static)
+ DEPENDS boost_unit_test_framework-static)
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/mpl/test/apply.cpp
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/mpl/test/apply.cpp (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/mpl/test/apply.cpp 2007-06-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -17,10 +17,6 @@
#include <boost/mpl/int.hpp>
#include <boost/mpl/aux_/test.hpp>
-#if defined (__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 1) && (__GNUC_PATCHLEVEL__ == 2)
-#warning Turning off certain tests due to internal compiler error
-#else
-
template< typename T > struct std_vector
{
#if defined(BOOST_MPL_CFG_NO_IMPLICIT_METAFUNCTIONS)
@@ -134,4 +130,3 @@
MPL_ASSERT_RELATION( res::value, ==, 5 );
}
-#endif
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-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -21,18 +21,18 @@
boost_test_compile_fail(fail_ref_cview2)
boost_test_compile_fail(fail_ref_cview3)
-boost_test_run(constructors LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(access LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(compare LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(iterators LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(slice LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(assign LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(assign_to_array LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(index_bases LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(storage_order LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(reshape LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(range1 LIBRARIES boost_test_exec_monitor-static )
-boost_test_run(idxgen1 LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(stl_interaction LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(resize LIBRARIES boost_test_exec_monitor-static)
+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_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-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -18,7 +18,7 @@
boost_test_run(test_serialization
SOURCES test_serialization.cpp test_serialization1.cpp
test_serialization2.cpp test_serialization_main.cpp
- LIBRARIES boost_serialization-static)
+ DEPENDS boost_serialization-static)
boost_test_run(test_set_ops SOURCES test_set_ops.cpp test_set_ops_main.cpp)
boost_test_run(test_special_set_ops SOURCES test_special_set_ops.cpp test_special_set_ops_main.cpp)
boost_test_run(test_update SOURCES 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-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -12,10 +12,10 @@
boost_test_run(pi)
boost_test_run(pow)
-boost_test_run(cmp LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(cmp_exn LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(cmp_exp LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(cmp_lex LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(cmp_set LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(cmp_tribool LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(test_float LIBRARIES boost_test_exec_monitor-static)
+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)
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-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -1 +1 @@
-boost_test_run(test_pool_alloc LIBRARIES boost_test_exec_monitor-static)
\ No newline at end of file
+boost_test_run(test_pool_alloc DEPENDS boost_test_exec_monitor-static)
\ No newline at end of file
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-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -4,10 +4,10 @@
macro(program_options_test_run TESTNAME)
boost_test_run(${TESTNAME}
- LIBRARIES boost_program_options-static boost_test_exec_monitor-static)
+ DEPENDS boost_program_options-static boost_test_exec_monitor-static)
boost_test_run("${TESTNAME}_dll"
SOURCES "${TESTNAME}.cpp"
- LIBRARIES boost_program_options-shared boost_test_exec_monitor-static)
+ DEPENDS boost_program_options-shared boost_test_exec_monitor-static)
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-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -1,14 +1,14 @@
-boost_test_run(ptr_vector LIBRARIES boost_unit_test_framework-static)
-boost_test_run(ptr_list LIBRARIES boost_unit_test_framework-static)
-boost_test_run(ptr_deque LIBRARIES boost_unit_test_framework-static)
-boost_test_run(ptr_set LIBRARIES boost_unit_test_framework-static)
-boost_test_run(ptr_map LIBRARIES boost_unit_test_framework-static)
-boost_test_run(ptr_array LIBRARIES boost_unit_test_framework-static)
-boost_test_run(tree_test LIBRARIES boost_unit_test_framework-static)
-boost_test_run(incomplete_type_test LIBRARIES boost_unit_test_framework-static)
-boost_test_run(view_example LIBRARIES boost_unit_test_framework-static)
-boost_test_run(iterator_test LIBRARIES boost_unit_test_framework-static)
-boost_test_run(tut1 LIBRARIES boost_unit_test_framework-static)
-boost_test_run(indirect_fun LIBRARIES boost_unit_test_framework-static)
-boost_test_run(serialization LIBRARIES boost_unit_test_framework-static boost_serialization-static)
-boost_test_run(no_exceptions LIBRARIES boost_unit_test_framework-static)
+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)
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-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -1,11 +1,11 @@
-boost_test_run(array LIBRARIES boost_unit_test_framework-static)
-boost_test_run(iterator_pair LIBRARIES boost_unit_test_framework-static)
-boost_test_run(std_container LIBRARIES boost_unit_test_framework-static)
-boost_test_run(string LIBRARIES boost_unit_test_framework-static)
-boost_test_run(iterator_range LIBRARIES boost_unit_test_framework-static)
-boost_test_run(sub_range LIBRARIES boost_unit_test_framework-static)
-boost_test_run(partial_workaround LIBRARIES boost_unit_test_framework-static)
-boost_test_run(algorithm_example LIBRARIES boost_unit_test_framework-static)
-boost_test_run(reversible_range LIBRARIES boost_unit_test_framework-static)
-boost_test_run(const_ranges LIBRARIES boost_unit_test_framework-static)
-boost_test_run(extension_mechanism LIBRARIES boost_unit_test_framework-static)
+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)
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-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -1,5 +1,5 @@
boost_test_run(rational_example SOURCES ../rational_example.cpp)
boost_test_run(rational_test
SOURCES ../rational_test.cpp
- LIBRARIES boost_unit_test_framework-static
+ DEPENDS boost_unit_test_framework-static
)
\ No newline at end of file
Modified: sandbox-branches/boost-cmake/boost_1_34_0/libs/regex/src/CMakeLists.txt
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/libs/regex/src/CMakeLists.txt (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/libs/regex/src/CMakeLists.txt 2007-06-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -25,7 +25,7 @@
wide_posix_api.cpp
winstances.cpp
usinstances.cpp
- LIBRARIES ${BOOST_REGEX_LIBRARIES}
+ LINK_LIBS ${BOOST_REGEX_LIBRARIES}
SHARED_COMPILE_FLAGS -DBOOST_REGEX_DYN_LINK=1)
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-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -42,13 +42,13 @@
# Tests linking against the static serialization library
boost_test_run("${testname}_${ARCHIVE}"
SOURCES ${BSL_TEST_SOURCES}
- LIBRARIES boost_test_exec_monitor-static ${BSL_TEST_STATIC_LIBRARIES}
+ DEPENDS boost_test_exec_monitor-static ${BSL_TEST_STATIC_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"
SOURCES ${BSL_TEST_SOURCES}
- LIBRARIES boost_test_exec_monitor-static ${BSL_TEST_SHARED_LIBRARIES}
+ DEPENDS boost_test_exec_monitor-static ${BSL_TEST_SHARED_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/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-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -1,5 +1,5 @@
boost_test_run(examples SOURCES ../examples.cpp
- LIBRARIES boost_test_exec_monitor-static)
+ DEPENDS boost_test_exec_monitor-static)
boost_test_run(simple_example_1 SOURCES ../simple_example_1.cpp)
boost_test_run(simple_example_2 SOURCES ../simple_example_2.cpp)
boost_test_run(simple_example_3 SOURCES ../simple_example_3.cpp)
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-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -6,12 +6,12 @@
boost_test_compile_fail(checked_delete_test SOURCES ../checked_delete_test.cpp)
boost_test_run(compressed_pair_test
SOURCES ../compressed_pair_test
- LIBRARIES boost_test_exec_monitor-static)
+ DEPENDS boost_test_exec_monitor-static)
boost_test_run(current_function_test SOURCES ../current_function_test.cpp)
boost_test_run(iterators_test
SOURCES ../iterators_test.cpp
- LIBRARIES boost_test_exec_monitor-static)
-boost_test_run(next_prior_test LIBRARIES boost_test_exec_monitor-static)
+ DEPENDS boost_test_exec_monitor-static)
+boost_test_run(next_prior_test DEPENDS boost_test_exec_monitor-static)
boost_test_compile_fail(noncopyable_test SOURCES ../noncopyable_test.cpp)
boost_test_run(numeric_traits_test SOURCES ../numeric_traits_test.cpp)
if (${CMAKE_SYSTEM} MATCHES "FreeBSD-.*")
@@ -19,12 +19,12 @@
elseif(${CMAKE_SYSTEM} MATCHES "FreeBSD-.*")
boost_test_run(operators_test
SOURCES ../operators_test.cpp
- LIBRARIES boost_test_exec_monitor-static)
+ DEPENDS boost_test_exec_monitor-static)
endif(${CMAKE_SYSTEM} MATCHES "FreeBSD-.*")
boost_test_compile(ref_ct_test SOURCES ../ref_ct_test.cpp)
boost_test_run(ref_test
SOURCES ../ref_test.cpp
- LIBRARIES boost_test_exec_monitor-static)
+ DEPENDS boost_test_exec_monitor-static)
boost_test_compile(result_of_test)
boost_test_run(shared_iterator_test SOURCES ../shared_iterator_test.cpp)
boost_test_run(value_init_test SOURCES ../value_init_test.cpp)
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-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -80,7 +80,7 @@
# Multi-threading support
if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
set(MULTI_THREADED_COMPILE_FLAGS "-pthreads")
- set(MULTI_THREADED_LINK_FLAGS "-lrt")
+ set(MULTI_THREADED_LINK_LIBS rt)
elseif(CMAKE_SYSTEM_NAME STREQUAL "BeOS")
# No threading options necessary for BeOS
elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSD")
Modified: sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/boost-core.cmake
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/boost-core.cmake (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/boost-core.cmake 2007-06-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -145,7 +145,8 @@
macro(boost_library_variant LIBNAME)
set(THIS_VARIANT_COMPILE_FLAGS "${THIS_LIB_COMPILE_FLAGS}")
- set(THIS_VARIANT_LINK_FLAGS "${THIS_LIB_COMPILE_FLAGS}")
+ set(THIS_VARIANT_LINK_FLAGS "${THIS_LIB_LINK_FLAGS}")
+ set(THIS_VARIANT_LINK_LIBS "${THIS_LIB_LINK_LIBS}")
# Determine if it is okay to build this variant
set(THIS_VARIANT_OKAY TRUE)
@@ -168,7 +169,7 @@
# Accumulate compile and link flags
set(THIS_VARIANT_COMPILE_FLAGS "${THIS_VARIANT_COMPILE_FLAGS} ${THIS_LIB_${ARG}_COMPILE_FLAGS} ${${ARG}_COMPILE_FLAGS}")
set(THIS_VARIANT_LINK_FLAGS "${THIS_VARIANT_LINK_FLAGS} ${THIS_LIB_${ARG}_LINK_FLAGS} ${${ARG}_LINK_FLAGS}")
- set(THIS_VARIANT_LINK_LIBS "${${ARG}_LINK_LIBS}")
+ set(THIS_VARIANT_LINK_LIBS "${THIS_VARIANT_LINK_LIBS} ${THIS_LIB_${ARG}_LINK_LIBS} ${${ARG}_LINK_LIBS}")
endforeach(ARG ${ARGN})
if (THIS_VARIANT_OKAY)
@@ -177,9 +178,11 @@
if (THIS_LIB_IS_DEBUG)
set(THIS_VARIANT_COMPILE_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} ${THIS_VARIANT_COMPILE_FLAGS}")
set(THIS_VARIANT_LINK_FLAGS "${CMAKE_LINK_FLAGS_DEBUG} ${THIS_VARIANT_LINK_FLAGS}")
+ set(THIS_VARIANT_LINK_LIBS "${THIS_VARIANT_LINK_LIBS}")
else (THIS_LIB_IS_DEBUG)
set(THIS_VARIANT_COMPILE_FLAGS "${CMAKE_CXX_FLAGS_RELEASE} ${THIS_VARIANT_COMPILE_FLAGS}")
set(THIS_VARIANT_LINK_FLAGS "${CMAKE_LINK_FLAGS_RELEASE} ${THIS_VARIANT_LINK_FLAGS}")
+ set(THIS_VARIANT_LINK_LIBS "${THIS_VARIANT_LINK_LIBS}")
endif (THIS_LIB_IS_DEBUG)
# Determine the suffix for this library target
@@ -250,12 +253,14 @@
add_dependencies(${LIBNAME} ${VARIANT_LIBNAME})
# Link against whatever libraries this library depends on
- target_link_libraries(${VARIANT_LIBNAME} ${THIS_LIB_LIBRARIES})
+ separate_arguments(THIS_VARIANT_LINK_LIBS)
+ foreach(library ${THIS_VARIANT_LINK_LIBS})
+ target_link_libraries(${VARIANT_LIBNAME} ${library}) # loop maybe unnecessary here
+ endforeach(library ${THIS_VARIANT_LINK_LIBS})
foreach(dependency ${THIS_LIB_DEPENDS})
target_link_libraries(${VARIANT_LIBNAME} "${dependency}${VARIANT_TARGET_NAME}")
endforeach(dependency "${THIS_LIB_DEPENDS}")
- target_link_libraries(${VARIANT_LIBNAME} ${THIS_VARIANT_LINK_LIBS})
# Installation of this library variant
install(TARGETS ${VARIANT_LIBNAME} DESTINATION lib)
endif (THIS_VARIANT_OKAY)
@@ -327,14 +332,14 @@
# Feature flag options, used by the boost_library macro
foreach(FEATURE ${ARGN})
set(BOOST_ADDLIB_ARG_NAMES
- "${BOOST_ADDLIB_ARG_NAMES};${FEATURE}_COMPILE_FLAGS;${FEATURE}_LINK_FLAGS")
+ "${BOOST_ADDLIB_ARG_NAMES};${FEATURE}_COMPILE_FLAGS;${FEATURE}_LINK_FLAGS:${FEATURE}_LINK_LIBS")
set(BOOST_ADDLIB_OPTION_NAMES "${BOOST_ADDLIB_OPTION_NAMES};NO_${FEATURE}")
endforeach(FEATURE ${ARGN})
endmacro(boost_add_default_variant)
macro(boost_library)
parse_arguments(THIS_LIB
- "DEPENDS;LIBRARIES;${BOOST_ADDLIB_ARG_NAMES}"
+ "DEPENDS;LINK_LIBS;COMPILE_FLAGS;LINK_FLAGS;${BOOST_ADDLIB_ARG_NAMES}"
"STATIC_TAG;MODULE;${BOOST_ADDLIB_OPTION_NAMES}"
${ARGN}
)
Modified: sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/boost-testing.cmake
==============================================================================
--- sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/boost-testing.cmake (original)
+++ sandbox-branches/boost-cmake/boost_1_34_0/tools/build/CMake/boost-testing.cmake 2007-06-05 15:47:41 EDT (Tue, 05 Jun 2007)
@@ -40,7 +40,7 @@
set(BOOST_TEST_OKAY TRUE)
set(BOOST_TEST_COMPILE_FLAGS "")
parse_arguments(BOOST_TEST
- "SOURCES;LIBRARIES;DEPENDS;COMPILE_FLAGS;ARGS"
+ "SOURCES;LINK_LIBS;DEPENDS;COMPILE_FLAGS;ARGS"
""
${ARGN}
)
@@ -82,7 +82,7 @@
COMPILE_FLAGS "${BOOST_TEST_COMPILE_FLAGS}"
OUTPUT_NAME ${PROJECT_NAME}/${testname})
target_link_libraries(${testname} ${BOOST_TEST_DEPENDS})
- target_link_libraries(${testname} ${BOOST_TEST_LIBRARIES})
+ 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)
@@ -97,7 +97,7 @@
COMPILE_FLAGS "${BOOST_TEST_COMPILE_FLAGS}"
OUTPUT_NAME ${PROJECT_NAME}/${testname})
target_link_libraries(${testname} ${BOOST_TEST_DEPENDS})
- target_link_libraries(${testname} ${BOOST_TEST_LIBRARIES})
+ 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}"
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