From: dgregor_at_[hidden]
Date: 2008-07-18 11:08:04
Author: dgregor
Date: 2008-07-18 11:08:04 EDT (Fri, 18 Jul 2008)
New Revision: 47563
URL: http://svn.boost.org/trac/boost/changeset/47563
Log:
Allow extra options to be passed through boost_test_run, to fix some lingering linking issues in the regex tests
Text files modified:
branches/CMake/release/libs/regex/test/CMakeLists.txt | 7 ++++---
branches/CMake/release/tools/build/CMake/BoostDocs.cmake | 18 ++++++++++++++++++
branches/CMake/release/tools/build/CMake/BoostTesting.cmake | 21 +++++++++------------
3 files changed, 31 insertions(+), 15 deletions(-)
Modified: branches/CMake/release/libs/regex/test/CMakeLists.txt
==============================================================================
--- branches/CMake/release/libs/regex/test/CMakeLists.txt (original)
+++ branches/CMake/release/libs/regex/test/CMakeLists.txt 2008-07-18 11:08:04 EDT (Fri, 18 Jul 2008)
@@ -41,11 +41,12 @@
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
+ EXTRA_OPTIONS SHARED)
boost_test_run(regex_regress_threaded ${R_SOURCES}
COMPILE_FLAGS "-DTEST_THREADS -DBOOST_REGEX_DYN_LINK=1"
- MULTI_THREADED SHARED
- DEPENDS boost_regex boost_thread)
+ DEPENDS boost_regex boost_thread
+ EXTRA_OPTIONS SHARED MULTI_THREADED)
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)
Modified: branches/CMake/release/tools/build/CMake/BoostDocs.cmake
==============================================================================
--- branches/CMake/release/tools/build/CMake/BoostDocs.cmake (original)
+++ branches/CMake/release/tools/build/CMake/BoostDocs.cmake 2008-07-18 11:08:04 EDT (Fri, 18 Jul 2008)
@@ -148,6 +148,8 @@
${ARGN})
# Create a Doxygen configuration file template
+ # TODO: We would like to create this file at build time rather
+ # than at configuration time
get_filename_component(DOXYFILE_PATH ${OUTPUT} PATH)
get_filename_component(DOXYFILE_NAME ${OUTPUT} NAME_WE)
set(DOXYFILE ${DOXYFILE_PATH}/${DOXYFILE_NAME}.doxyfile)
@@ -198,6 +200,22 @@
COMMENT "Transforming Doxygen XML into BoostBook XML for Boost.${PROJECT_NAME}...")
endmacro(doxygen_to_boostbook)
+# Adds documentation for the current library or tool project
+#
+# boost_add_documentation(source1 source2 source3 ...
+# [HEADERS header1 header2 ...]
+# [DOXYGEN_PARAMETERS param1=value1 param2=value2 ...])
+#
+
+# This macro describes the documentation for a library or tool, which
+# will be built and installed as part of the normal build
+# process. Documentation can be in a variety of formats, and the input
+# format will determine how that documentation is transformed. The
+# documentation's format is determined by its extension, and the
+# following input formats are supported:
+#
+# QuickBook
+# BoostBook (.XML extension):
macro(boost_add_documentation SOURCE)
parse_arguments(THIS_DOC
"HEADERS;DOXYGEN_PARAMETERS"
Modified: branches/CMake/release/tools/build/CMake/BoostTesting.cmake
==============================================================================
--- branches/CMake/release/tools/build/CMake/BoostTesting.cmake (original)
+++ branches/CMake/release/tools/build/CMake/BoostTesting.cmake 2008-07-18 11:08:04 EDT (Fri, 18 Jul 2008)
@@ -99,7 +99,7 @@
set(BOOST_TEST_OKAY TRUE)
set(BOOST_TEST_COMPILE_FLAGS "")
parse_arguments(BOOST_TEST
- "LINK_LIBS;LINK_FLAGS;DEPENDS;COMPILE_FLAGS;ARGS"
+ "LINK_LIBS;LINK_FLAGS;DEPENDS;COMPILE_FLAGS;ARGS;EXTRA_OPTIONS"
"COMPILE;RUN;LINK;FAIL;RELEASE;DEBUG"
${ARGN}
)
@@ -162,7 +162,8 @@
# [COMPILE_FLAGS compileflags]
# [LINK_FLAGS linkflags]
# [LINK_LIBS linklibs]
-# [DEPENDS libdepend1 libdepend2 ...])
+# [DEPENDS libdepend1 libdepend2 ...]
+# [EXTRA_OPTIONS option1 option2 ...])
#
# testname is the name of the test. source1, source2, etc. are the
# source files that will be built and linked into the test
@@ -195,23 +196,19 @@
# the name of a particular variant of a Boost library, e.g.,
# boost_signals-static.
#
-# Example:
-# boost_test_run(signal_test DEPENDS boost_signals-static)
+# EXTRA_OPTIONS: Provide extra options that will be passed on to
+# boost_add_executable.
#
-# TODO:
-# - Improve handling of DEPENDS, so that we can specify just the
-# library's abstract target (e.g., "boost_signals"), and possibly
-# some features required for building the test (e.g.,
-# MULTI_THREADED, STATIC). The test macros should then pick the
-# best library variant available to meet those features and the
-# current build variant (Debug or Release).
+# Example:
+# boost_test_run(signal_test DEPENDS boost_signals)
macro(boost_test_run testname)
boost_test_parse_args(${testname} ${ARGN} RUN)
if (BOOST_TEST_OKAY)
boost_add_executable(${testname} ${BOOST_TEST_SOURCES}
OUTPUT_NAME tests/${PROJECT_NAME}/${testname}
DEPENDS "${BOOST_TEST_DEPENDS}"
- NO_INSTALL)
+ NO_INSTALL
+ ${BOOST_TEST_EXTRA_OPTIONS})
if (THIS_EXE_OKAY)