From: dgregor_at_[hidden]
Date: 2008-07-17 15:23:56
Author: dgregor
Date: 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
New Revision: 47513
URL: http://svn.boost.org/trac/boost/changeset/47513
Log:
tools/build/CMake/BoostCore.cmake:
- Turn off the Boost-subsetting options (BUILD_BOOST_*, TEST_BOOST_*), which
are causing trouble and will not be used.
- Add the MODULARIZED option to boost_library_project, which says that the
library has been modularized and tested that way. Only MODULARIZED
libraries go into the main "modularize" target.
Remove all module.cmake files; we're starting over with the dependencies.
Removed:
branches/CMake/release/libs/accumulators/module.cmake
branches/CMake/release/libs/algorithm/module.cmake
branches/CMake/release/libs/any/module.cmake
branches/CMake/release/libs/array/module.cmake
branches/CMake/release/libs/asio/module.cmake
branches/CMake/release/libs/assign/module.cmake
branches/CMake/release/libs/bind/module.cmake
branches/CMake/release/libs/circular_buffer/module.cmake
branches/CMake/release/libs/concept_check/module.cmake
branches/CMake/release/libs/config/module.cmake
branches/CMake/release/libs/conversion/module.cmake
branches/CMake/release/libs/crc/module.cmake
branches/CMake/release/libs/date_time/module.cmake
branches/CMake/release/libs/disjoint_sets/module.cmake
branches/CMake/release/libs/exception/module.cmake
branches/CMake/release/libs/filesystem/module.cmake
branches/CMake/release/libs/graph/module.cmake
branches/CMake/release/libs/integer/module.cmake
branches/CMake/release/libs/iterator/module.cmake
branches/CMake/release/libs/mpi/module.cmake
branches/CMake/release/libs/mpl/module.cmake
branches/CMake/release/libs/numeric/module.cmake
branches/CMake/release/libs/ptr_container/module.cmake
branches/CMake/release/libs/python/module.cmake
branches/CMake/release/libs/random/module.cmake
branches/CMake/release/libs/range/module.cmake
branches/CMake/release/libs/serialization/module.cmake
branches/CMake/release/libs/smart_ptr/module.cmake
branches/CMake/release/libs/spirit/module.cmake
branches/CMake/release/libs/test/module.cmake
branches/CMake/release/libs/tuple/module.cmake
branches/CMake/release/libs/type_traits/module.cmake
branches/CMake/release/libs/utility/module.cmake
branches/CMake/release/libs/wave/module.cmake
branches/CMake/release/libs/xpressive/module.cmake
Text files modified:
branches/CMake/release/tools/build/CMake/BoostCore.cmake | 78 ++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 42 deletions(-)
Deleted: branches/CMake/release/libs/accumulators/module.cmake
==============================================================================
--- branches/CMake/release/libs/accumulators/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(accumulators DEPENDS serialization)
\ No newline at end of file
Deleted: branches/CMake/release/libs/algorithm/module.cmake
==============================================================================
--- branches/CMake/release/libs/algorithm/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(algorithm DEPENDS config iterator test)
\ No newline at end of file
Deleted: branches/CMake/release/libs/any/module.cmake
==============================================================================
--- branches/CMake/release/libs/any/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1,2 +0,0 @@
-boost_module(any DEPENDS config mpl type_traits utility)
-
Deleted: branches/CMake/release/libs/array/module.cmake
==============================================================================
--- branches/CMake/release/libs/array/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(array DEPENDS config exception utility)
\ No newline at end of file
Deleted: branches/CMake/release/libs/asio/module.cmake
==============================================================================
--- branches/CMake/release/libs/asio/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1,2 +0,0 @@
-boost_module(asio)
-
Deleted: branches/CMake/release/libs/assign/module.cmake
==============================================================================
--- branches/CMake/release/libs/assign/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(assign DEPENDS config range type_traits)
\ No newline at end of file
Deleted: branches/CMake/release/libs/bind/module.cmake
==============================================================================
--- branches/CMake/release/libs/bind/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(bind DEPENDS config utility)
\ No newline at end of file
Deleted: branches/CMake/release/libs/circular_buffer/module.cmake
==============================================================================
--- branches/CMake/release/libs/circular_buffer/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(circular_buffer DEPENDS type_traits)
\ No newline at end of file
Deleted: branches/CMake/release/libs/concept_check/module.cmake
==============================================================================
--- branches/CMake/release/libs/concept_check/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1,2 +0,0 @@
-boost_module(Concept_check
- DEPENDS config iterator mpl preprocessor type_traits)
\ No newline at end of file
Deleted: branches/CMake/release/libs/config/module.cmake
==============================================================================
--- branches/CMake/release/libs/config/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(Config DEPENDS test)
\ No newline at end of file
Deleted: branches/CMake/release/libs/conversion/module.cmake
==============================================================================
--- branches/CMake/release/libs/conversion/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(conversion DEPENDS type_traits)
\ No newline at end of file
Deleted: branches/CMake/release/libs/crc/module.cmake
==============================================================================
--- branches/CMake/release/libs/crc/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(crc DEPENDS integer random test)
\ No newline at end of file
Deleted: branches/CMake/release/libs/date_time/module.cmake
==============================================================================
--- branches/CMake/release/libs/date_time/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(date_time DEPENDS exception)
\ No newline at end of file
Deleted: branches/CMake/release/libs/disjoint_sets/module.cmake
==============================================================================
--- branches/CMake/release/libs/disjoint_sets/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(disjoint_sets DEPENDS graph)
\ No newline at end of file
Deleted: branches/CMake/release/libs/exception/module.cmake
==============================================================================
--- branches/CMake/release/libs/exception/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(exception DEPENDS config intrusive smart_ptr tuple utility)
\ No newline at end of file
Deleted: branches/CMake/release/libs/filesystem/module.cmake
==============================================================================
--- branches/CMake/release/libs/filesystem/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(Filesystem DEPENDS system)
\ No newline at end of file
Deleted: branches/CMake/release/libs/graph/module.cmake
==============================================================================
--- branches/CMake/release/libs/graph/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1,2 +0,0 @@
-boost_library_project(graph
- DEPENDS concept_check disjoint_sets spirit type_traits)
\ No newline at end of file
Deleted: branches/CMake/release/libs/integer/module.cmake
==============================================================================
--- branches/CMake/release/libs/integer/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(integer DEPENDS test)
\ No newline at end of file
Deleted: branches/CMake/release/libs/iterator/module.cmake
==============================================================================
--- branches/CMake/release/libs/iterator/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1,2 +0,0 @@
-boost_module(Iterator
- DEPENDS concept_check config mpl preprocessor type_traits utility)
\ No newline at end of file
Deleted: branches/CMake/release/libs/mpi/module.cmake
==============================================================================
--- branches/CMake/release/libs/mpi/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(MPI DEPENDS graph serialization)
Deleted: branches/CMake/release/libs/mpl/module.cmake
==============================================================================
--- branches/CMake/release/libs/mpl/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(MPL DEPENDS config preprocessor test type_traits)
\ No newline at end of file
Deleted: branches/CMake/release/libs/numeric/module.cmake
==============================================================================
--- branches/CMake/release/libs/numeric/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(numeric DEPENDS serialization)
\ No newline at end of file
Deleted: branches/CMake/release/libs/ptr_container/module.cmake
==============================================================================
--- branches/CMake/release/libs/ptr_container/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(pointer_containers DEPENDS serialization)
\ No newline at end of file
Deleted: branches/CMake/release/libs/python/module.cmake
==============================================================================
--- branches/CMake/release/libs/python/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(Python DEPENDS graph)
Deleted: branches/CMake/release/libs/random/module.cmake
==============================================================================
--- branches/CMake/release/libs/random/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(random DEPENDS integer iterator)
\ No newline at end of file
Deleted: branches/CMake/release/libs/range/module.cmake
==============================================================================
--- branches/CMake/release/libs/range/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(range DEPENDS config iterator mpl type_traits)
\ No newline at end of file
Deleted: branches/CMake/release/libs/serialization/module.cmake
==============================================================================
--- branches/CMake/release/libs/serialization/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(Serialization DEPENDS config mpl preprocessor type_traits utility)
\ No newline at end of file
Deleted: branches/CMake/release/libs/smart_ptr/module.cmake
==============================================================================
--- branches/CMake/release/libs/smart_ptr/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(smart_ptr DEPENDS config exception intrusive utility)
\ No newline at end of file
Deleted: branches/CMake/release/libs/spirit/module.cmake
==============================================================================
--- branches/CMake/release/libs/spirit/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(spirit DEPENDS xpressive)
\ No newline at end of file
Deleted: branches/CMake/release/libs/test/module.cmake
==============================================================================
--- branches/CMake/release/libs/test/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(Test DEPENDS config mpl preprocessor type_traits)
Deleted: branches/CMake/release/libs/tuple/module.cmake
==============================================================================
--- branches/CMake/release/libs/tuple/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(tuple DEPENDS config mpl type_traits utility)
\ No newline at end of file
Deleted: branches/CMake/release/libs/type_traits/module.cmake
==============================================================================
--- branches/CMake/release/libs/type_traits/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(type_traits DEPENDS config mpl)
\ No newline at end of file
Deleted: branches/CMake/release/libs/utility/module.cmake
==============================================================================
--- branches/CMake/release/libs/utility/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(utility DEPENDS config exception test)
\ No newline at end of file
Deleted: branches/CMake/release/libs/wave/module.cmake
==============================================================================
--- branches/CMake/release/libs/wave/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(Wave DEPENDS filesystem thread date_time)
\ No newline at end of file
Deleted: branches/CMake/release/libs/xpressive/module.cmake
==============================================================================
--- branches/CMake/release/libs/xpressive/module.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
+++ (empty file)
@@ -1 +0,0 @@
-boost_module(xpressive)
\ No newline at end of file
Modified: branches/CMake/release/tools/build/CMake/BoostCore.cmake
==============================================================================
--- branches/CMake/release/tools/build/CMake/BoostCore.cmake (original)
+++ branches/CMake/release/tools/build/CMake/BoostCore.cmake 2008-07-17 15:23:53 EDT (Thu, 17 Jul 2008)
@@ -30,7 +30,7 @@
# [DESCRIPTION description]
# [AUTHORS author1 author2 ...]
# [MAINTAINERS maint1 maint2 ...]
-# [MODULAR])
+# [MODULARIZED])
#
# where libname is the name of the library (e.g., Python, or
# Filesystem), srcdir1, srcdir2, etc, are subdirectories containing
@@ -70,7 +70,7 @@
macro(boost_library_project LIBNAME)
parse_arguments(THIS_PROJECT
"SRCDIRS;TESTDIRS;HEADERS;DOCDIRS;DESCRIPTION;AUTHORS;MAINTAINERS"
- ""
+ "MODULARIZED"
${ARGN}
)
@@ -94,20 +94,21 @@
endwhile()
set(THIS_PROJECT_OKAY ON)
- set(THIS_PROJECT_FAILED_DEPS "")
- foreach(DEP ${THIS_PROJECT_DEPENDS_ALL})
- string(TOUPPER "BUILD_BOOST_${DEP}" BOOST_LIB_DEP)
- if (NOT ${BOOST_LIB_DEP})
- set(THIS_PROJECT_OKAY OFF)
- set(THIS_PROJECT_FAILED_DEPS "${THIS_PROJECT_FAILED_DEPS} ${DEP}\n")
- endif (NOT ${BOOST_LIB_DEP})
- endforeach(DEP)
- string(TOUPPER "BUILD_BOOST_${LIBNAME}" BOOST_BUILD_LIB_OPTION)
-
- option(${BOOST_BUILD_LIB_OPTION}
- "Build Boost.${LIBNAME} (prefer make targets, not this, to build individual libs)"
- ${THIS_PROJECT_OKAY})
+ if(FALSE)
+ # This really isn't the check we want to do, especially when we
+ # hit circular dependencies. For now, just enable all libraries to
+ # be built all the time, until we can implement proper subsetting
+ # behavior at the CMake level.
+ set(THIS_PROJECT_FAILED_DEPS "")
+ foreach(DEP ${THIS_PROJECT_DEPENDS_ALL})
+ string(TOUPPER "BUILD_BOOST_${DEP}" BOOST_LIB_DEP)
+ if (NOT ${BOOST_LIB_DEP})
+ set(THIS_PROJECT_OKAY OFF)
+ set(THIS_PROJECT_FAILED_DEPS "${THIS_PROJECT_FAILED_DEPS} ${DEP}\n")
+ endif (NOT ${BOOST_LIB_DEP})
+ endforeach(DEP)
+ endif(FALSE)
if (THIS_PROJECT_SRCDIRS)
# This Boost library has source directories, so provide an option
@@ -127,7 +128,7 @@
endif (NOT THIS_PROJECT_OKAY)
endif (THIS_PROJECT_SRCDIRS)
- if(${BOOST_BUILD_LIB_OPTION} AND THIS_PROJECT_OKAY)
+ if(THIS_PROJECT_OKAY)
string(TOLOWER "${LIBNAME}" libname)
string(TOUPPER "${LIBNAME}" ULIBNAME)
project(${LIBNAME})
@@ -250,7 +251,10 @@
${${LIBNAME}-modularize-commands}
COMMENT "Modularizing ${LIBNAME} headers to project-local dir from monolithic boost dir"
)
- add_dependencies(modularize ${LIBNAME}-modularize)
+
+ if(THIS_PROJECT_MODULARIZED)
+ add_dependencies(modularize ${LIBNAME}-modularize)
+ endif(THIS_PROJECT_MODULARIZED)
endif()
endif(THIS_PROJECT_HEADERS)
@@ -315,31 +319,21 @@
if(BUILD_TESTING AND THIS_PROJECT_TESTDIRS)
# Testing is enabled globally and this project has some
- # tests. So, add a testing option.
- string(TOUPPER "TEST_BOOST_${LIBNAME}" BOOST_TEST_LIB_OPTION)
- option(${BOOST_TEST_LIB_OPTION}
- "Enable testing of Boost.${LIBNAME}"
- ON)
-
- # Only create test target and include the test directories
- # when testing is enabled for this project.
- if(${BOOST_TEST_LIB_OPTION})
- add_custom_target(${PROJECT_NAME}-test)
-
- add_dependencies(test ${PROJECT_NAME}-test)
-
- # the last argument here, the binary directory that the
- # logs are in, has to match the binary directory
- # passed to 'add_subdirectory', in the foreach() just below
- boost_post_results(${PROJECT_NAME} ${PROJECT_NAME}-test
- test
- ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-test)
-
- foreach(SUBDIR ${THIS_PROJECT_TESTDIRS})
- add_subdirectory(${SUBDIR} ${PROJECT_NAME}-test)
- endforeach()
+ # tests. So, include the tests
+ add_custom_target(${PROJECT_NAME}-test)
- endif(${BOOST_TEST_LIB_OPTION})
+ add_dependencies(test ${PROJECT_NAME}-test)
+
+ # the last argument here, the binary directory that the
+ # logs are in, has to match the binary directory
+ # passed to 'add_subdirectory', in the foreach() just below
+ boost_post_results(${PROJECT_NAME} ${PROJECT_NAME}-test
+ test
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-test)
+
+ foreach(SUBDIR ${THIS_PROJECT_TESTDIRS})
+ add_subdirectory(${SUBDIR} ${PROJECT_NAME}-test)
+ endforeach()
endif(BUILD_TESTING AND THIS_PROJECT_TESTDIRS)
if (BUILD_DOCUMENTATION AND THIS_PROJECT_DOCDIRS)
@@ -347,7 +341,7 @@
add_subdirectory(${SUBDIR})
endforeach(SUBDIR)
endif ()
- endif(${BOOST_BUILD_LIB_OPTION} AND THIS_PROJECT_OKAY)
+ endif()
endmacro(boost_library_project)
macro(boost_tool_project TOOLNAME)