From: troy_at_[hidden]
Date: 2008-06-04 21:41:36
Author: troy
Date: 2008-06-04 21:41:35 EDT (Wed, 04 Jun 2008)
New Revision: 46145
URL: http://svn.boost.org/trac/boost/changeset/46145
Log:
Add switch for cmake self-testing aka BOOST_BUILD_SANITY_TEST
Text files modified:
branches/CMake/release/CMakeLists.txt | 4 ++--
branches/CMake/release/tools/build/CMake/BoostTesting.cmake | 14 ++++++++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
Modified: branches/CMake/release/CMakeLists.txt
==============================================================================
--- branches/CMake/release/CMakeLists.txt (original)
+++ branches/CMake/release/CMakeLists.txt 2008-06-04 21:41:35 EDT (Wed, 04 Jun 2008)
@@ -40,9 +40,9 @@
# Boost CMake modules #
##########################################################################
list(APPEND CMAKE_MODULE_PATH ${Boost_SOURCE_DIR}/tools/build/CMake)
-include(BoostBuildSlave)
include(BoostUtils)
include(BoostConfig)
+include(BoostBuildSlave)
include(BoostCore)
include(BoostDocs)
include(BoostTesting)
@@ -151,7 +151,7 @@
add_subdirectory(doc)
# Add build rules for all of the Boost libraries
-add_subdirectory(libs)
+add_subdirectory(${BOOST_LIBS_DIR})
# Add build rules for all of the Boost tools
# TODO: On hold while I work on the modularity code
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-06-04 21:41:35 EDT (Wed, 04 Jun 2008)
@@ -46,6 +46,16 @@
endif (TEST_INSTALLED_TREE)
endif (BUILD_TESTING)
+option(BOOST_BUILD_SANITY_TEST
+ "Don't build regular boost libraries, build libraries that test the boost cmake build system itself" OFF)
+
+if(BOOST_BUILD_SANITY_TEST)
+ set(BOOST_LIBS_DIR ${CMAKE_SOURCE_DIR}/tools/build/CMake/sanity)
+ configure_file(${CMAKE_SOURCE_DIR}/libs/CMakeLists.txt ${BOOST_LIBS_DIR}/CMakeLists.txt COPYONLY)
+else(BOOST_BUILD_SANITY_TEST)
+ set(BOOST_LIBS_DIR ${CMAKE_SOURCE_DIR}/libs)
+endif(BOOST_BUILD_SANITY_TEST)
+
# This macro is an internal utility macro that helps parse the
# arguments passed to the Boost testing commands. It will generally
# not be used by Boost developers.
@@ -90,7 +100,7 @@
set(BOOST_TEST_COMPILE_FLAGS "")
parse_arguments(BOOST_TEST
"LINK_LIBS;LINK_FLAGS;DEPENDS;COMPILE_FLAGS;ARGS"
- "COMPILE;RUN;LINK;FAIL"
+ "COMPILE;RUN;LINK;FAIL;RELEASE;DEBUG"
${ARGN}
)
@@ -217,7 +227,7 @@
COMMAND
${THIS_TEST_PREFIX_ARGS}
${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/tests/${PROJECT_NAME}/${testname}
- ${THIS_EXE_ARGS}
+ ${BOOST_TEST_ARGS}
COMMENT "Running ${testname} in project ${PROJECT_NAME}"
)