|
|
Boost-Commit : |
From: dgregor_at_[hidden]
Date: 2008-04-02 23:44:57
Author: dgregor
Date: 2008-04-02 23:44:56 EDT (Wed, 02 Apr 2008)
New Revision: 44010
URL: http://svn.boost.org/trac/boost/changeset/44010
Log:
Early stab at modularizing Boost with CMake
Added:
branches/CMake/release/libs/filesystem/include/
branches/CMake/release/libs/filesystem/include/boost/
branches/CMake/release/libs/filesystem/include/boost/filesystem/
- copied from r44007, /branches/CMake/release/boost/filesystem/
branches/CMake/release/libs/filesystem/include/boost/filesystem.hpp
- copied unchanged from r44007, /branches/CMake/release/boost/filesystem.hpp
branches/CMake/release/libs/filesystem/include/boost/filesystem/config.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/filesystem/config.hpp
branches/CMake/release/libs/filesystem/include/boost/filesystem/convenience.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/filesystem/convenience.hpp
branches/CMake/release/libs/filesystem/include/boost/filesystem/exception.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/filesystem/exception.hpp
branches/CMake/release/libs/filesystem/include/boost/filesystem/fstream.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/filesystem/fstream.hpp
branches/CMake/release/libs/filesystem/include/boost/filesystem/operations.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/filesystem/operations.hpp
branches/CMake/release/libs/filesystem/include/boost/filesystem/path.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/filesystem/path.hpp
branches/CMake/release/libs/graph/include/
branches/CMake/release/libs/graph/include/boost/
branches/CMake/release/libs/graph/include/boost/graph/
- copied from r44007, /branches/CMake/release/boost/graph/
branches/CMake/release/libs/graph/include/boost/graph/adj_list_serialize.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/adj_list_serialize.hpp
branches/CMake/release/libs/graph/include/boost/graph/adjacency_iterator.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/adjacency_iterator.hpp
branches/CMake/release/libs/graph/include/boost/graph/adjacency_list.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/adjacency_list.hpp
branches/CMake/release/libs/graph/include/boost/graph/adjacency_list_io.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/adjacency_list_io.hpp
branches/CMake/release/libs/graph/include/boost/graph/adjacency_matrix.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/adjacency_matrix.hpp
branches/CMake/release/libs/graph/include/boost/graph/astar_search.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/astar_search.hpp
branches/CMake/release/libs/graph/include/boost/graph/bandwidth.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/bandwidth.hpp
branches/CMake/release/libs/graph/include/boost/graph/bc_clustering.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/bc_clustering.hpp
branches/CMake/release/libs/graph/include/boost/graph/bellman_ford_shortest_paths.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/bellman_ford_shortest_paths.hpp
branches/CMake/release/libs/graph/include/boost/graph/betweenness_centrality.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/betweenness_centrality.hpp
branches/CMake/release/libs/graph/include/boost/graph/biconnected_components.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/biconnected_components.hpp
branches/CMake/release/libs/graph/include/boost/graph/boyer_myrvold_planar_test.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/boyer_myrvold_planar_test.hpp
branches/CMake/release/libs/graph/include/boost/graph/breadth_first_search.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/breadth_first_search.hpp
branches/CMake/release/libs/graph/include/boost/graph/chrobak_payne_drawing.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/chrobak_payne_drawing.hpp
branches/CMake/release/libs/graph/include/boost/graph/circle_layout.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/circle_layout.hpp
branches/CMake/release/libs/graph/include/boost/graph/compressed_sparse_row_graph.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/compressed_sparse_row_graph.hpp
branches/CMake/release/libs/graph/include/boost/graph/connected_components.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/connected_components.hpp
branches/CMake/release/libs/graph/include/boost/graph/copy.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/copy.hpp
branches/CMake/release/libs/graph/include/boost/graph/create_condensation_graph.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/create_condensation_graph.hpp
branches/CMake/release/libs/graph/include/boost/graph/cuthill_mckee_ordering.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/cuthill_mckee_ordering.hpp
branches/CMake/release/libs/graph/include/boost/graph/dag_shortest_paths.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/dag_shortest_paths.hpp
branches/CMake/release/libs/graph/include/boost/graph/depth_first_search.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/depth_first_search.hpp
branches/CMake/release/libs/graph/include/boost/graph/detail/
- copied from r44009, /branches/CMake/release/boost/graph/detail/
branches/CMake/release/libs/graph/include/boost/graph/dijkstra_shortest_paths.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/dijkstra_shortest_paths.hpp
branches/CMake/release/libs/graph/include/boost/graph/dominator_tree.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/dominator_tree.hpp
branches/CMake/release/libs/graph/include/boost/graph/edge_connectivity.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/edge_connectivity.hpp
branches/CMake/release/libs/graph/include/boost/graph/edge_list.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/edge_list.hpp
branches/CMake/release/libs/graph/include/boost/graph/edmunds_karp_max_flow.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/edmunds_karp_max_flow.hpp
branches/CMake/release/libs/graph/include/boost/graph/erdos_renyi_generator.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/erdos_renyi_generator.hpp
branches/CMake/release/libs/graph/include/boost/graph/exception.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/exception.hpp
branches/CMake/release/libs/graph/include/boost/graph/filtered_graph.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/filtered_graph.hpp
branches/CMake/release/libs/graph/include/boost/graph/floyd_warshall_shortest.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/floyd_warshall_shortest.hpp
branches/CMake/release/libs/graph/include/boost/graph/fruchterman_reingold.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/fruchterman_reingold.hpp
branches/CMake/release/libs/graph/include/boost/graph/graph_archetypes.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/graph_archetypes.hpp
branches/CMake/release/libs/graph/include/boost/graph/graph_as_tree.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/graph_as_tree.hpp
branches/CMake/release/libs/graph/include/boost/graph/graph_concepts.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/graph_concepts.hpp
branches/CMake/release/libs/graph/include/boost/graph/graph_selectors.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/graph_selectors.hpp
branches/CMake/release/libs/graph/include/boost/graph/graph_test.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/graph_test.hpp
branches/CMake/release/libs/graph/include/boost/graph/graph_traits.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/graph_traits.hpp
branches/CMake/release/libs/graph/include/boost/graph/graph_utility.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/graph_utility.hpp
branches/CMake/release/libs/graph/include/boost/graph/graphml.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/graphml.hpp
branches/CMake/release/libs/graph/include/boost/graph/graphviz.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/graphviz.hpp
branches/CMake/release/libs/graph/include/boost/graph/gursoy_atun_layout.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/gursoy_atun_layout.hpp
branches/CMake/release/libs/graph/include/boost/graph/howard_cycle_ratio.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/howard_cycle_ratio.hpp
branches/CMake/release/libs/graph/include/boost/graph/incremental_components.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/incremental_components.hpp
branches/CMake/release/libs/graph/include/boost/graph/is_kuratowski_subgraph.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/is_kuratowski_subgraph.hpp
branches/CMake/release/libs/graph/include/boost/graph/is_straight_line_drawing.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/is_straight_line_drawing.hpp
branches/CMake/release/libs/graph/include/boost/graph/isomorphism.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/isomorphism.hpp
branches/CMake/release/libs/graph/include/boost/graph/iteration_macros.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/iteration_macros.hpp
branches/CMake/release/libs/graph/include/boost/graph/iteration_macros_undef.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/iteration_macros_undef.hpp
branches/CMake/release/libs/graph/include/boost/graph/johnson_all_pairs_shortest.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/johnson_all_pairs_shortest.hpp
branches/CMake/release/libs/graph/include/boost/graph/kamada_kawai_spring_layout.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/kamada_kawai_spring_layout.hpp
branches/CMake/release/libs/graph/include/boost/graph/king_ordering.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/king_ordering.hpp
branches/CMake/release/libs/graph/include/boost/graph/kolmogorov_max_flow.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/kolmogorov_max_flow.hpp
branches/CMake/release/libs/graph/include/boost/graph/kruskal_min_spanning_tree.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/kruskal_min_spanning_tree.hpp
branches/CMake/release/libs/graph/include/boost/graph/leda_graph.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/leda_graph.hpp
branches/CMake/release/libs/graph/include/boost/graph/make_biconnected_planar.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/make_biconnected_planar.hpp
branches/CMake/release/libs/graph/include/boost/graph/make_connected.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/make_connected.hpp
branches/CMake/release/libs/graph/include/boost/graph/make_maximal_planar.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/make_maximal_planar.hpp
branches/CMake/release/libs/graph/include/boost/graph/matrix_as_graph.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/matrix_as_graph.hpp
branches/CMake/release/libs/graph/include/boost/graph/max_cardinality_matching.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/max_cardinality_matching.hpp
branches/CMake/release/libs/graph/include/boost/graph/minimum_degree_ordering.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/minimum_degree_ordering.hpp
branches/CMake/release/libs/graph/include/boost/graph/named_function_params.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/named_function_params.hpp
branches/CMake/release/libs/graph/include/boost/graph/neighbor_bfs.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/neighbor_bfs.hpp
branches/CMake/release/libs/graph/include/boost/graph/page_rank.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/page_rank.hpp
branches/CMake/release/libs/graph/include/boost/graph/planar_canonical_ordering.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/planar_canonical_ordering.hpp
branches/CMake/release/libs/graph/include/boost/graph/planar_detail/
- copied from r44009, /branches/CMake/release/boost/graph/planar_detail/
branches/CMake/release/libs/graph/include/boost/graph/planar_face_traversal.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/planar_face_traversal.hpp
branches/CMake/release/libs/graph/include/boost/graph/plod_generator.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/plod_generator.hpp
branches/CMake/release/libs/graph/include/boost/graph/prim_minimum_spanning_tree.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/prim_minimum_spanning_tree.hpp
branches/CMake/release/libs/graph/include/boost/graph/profile.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/profile.hpp
branches/CMake/release/libs/graph/include/boost/graph/properties.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/properties.hpp
branches/CMake/release/libs/graph/include/boost/graph/property_iter_range.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/property_iter_range.hpp
branches/CMake/release/libs/graph/include/boost/graph/push_relabel_max_flow.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/push_relabel_max_flow.hpp
branches/CMake/release/libs/graph/include/boost/graph/random.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/random.hpp
branches/CMake/release/libs/graph/include/boost/graph/random_layout.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/random_layout.hpp
branches/CMake/release/libs/graph/include/boost/graph/read_dimacs.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/read_dimacs.hpp
branches/CMake/release/libs/graph/include/boost/graph/relax.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/relax.hpp
branches/CMake/release/libs/graph/include/boost/graph/reverse_graph.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/reverse_graph.hpp
branches/CMake/release/libs/graph/include/boost/graph/sequential_vertex_coloring.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/sequential_vertex_coloring.hpp
branches/CMake/release/libs/graph/include/boost/graph/simple_point.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/simple_point.hpp
branches/CMake/release/libs/graph/include/boost/graph/sloan_ordering.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/sloan_ordering.hpp
branches/CMake/release/libs/graph/include/boost/graph/small_world_generator.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/small_world_generator.hpp
branches/CMake/release/libs/graph/include/boost/graph/smallest_last_ordering.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/smallest_last_ordering.hpp
branches/CMake/release/libs/graph/include/boost/graph/stanford_graph.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/stanford_graph.hpp
branches/CMake/release/libs/graph/include/boost/graph/strong_components.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/strong_components.hpp
branches/CMake/release/libs/graph/include/boost/graph/subgraph.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/subgraph.hpp
branches/CMake/release/libs/graph/include/boost/graph/topological_sort.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/topological_sort.hpp
branches/CMake/release/libs/graph/include/boost/graph/transitive_closure.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/transitive_closure.hpp
branches/CMake/release/libs/graph/include/boost/graph/transpose_graph.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/transpose_graph.hpp
branches/CMake/release/libs/graph/include/boost/graph/tree_traits.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/tree_traits.hpp
branches/CMake/release/libs/graph/include/boost/graph/two_bit_color_map.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/two_bit_color_map.hpp
branches/CMake/release/libs/graph/include/boost/graph/undirected_dfs.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/undirected_dfs.hpp
branches/CMake/release/libs/graph/include/boost/graph/vector_as_graph.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/vector_as_graph.hpp
branches/CMake/release/libs/graph/include/boost/graph/visitors.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/visitors.hpp
branches/CMake/release/libs/graph/include/boost/graph/wavefront.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/wavefront.hpp
branches/CMake/release/libs/graph/include/boost/graph/write_dimacs.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/graph/write_dimacs.hpp
branches/CMake/release/libs/system/include/
branches/CMake/release/libs/system/include/boost/
branches/CMake/release/libs/system/include/boost/system/
- copied from r44007, /branches/CMake/release/boost/system/
branches/CMake/release/libs/system/include/boost/system/config.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/system/config.hpp
branches/CMake/release/libs/system/include/boost/system/cygwin_error.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/system/cygwin_error.hpp
branches/CMake/release/libs/system/include/boost/system/error_code.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/system/error_code.hpp
branches/CMake/release/libs/system/include/boost/system/linux_error.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/system/linux_error.hpp
branches/CMake/release/libs/system/include/boost/system/system_error.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/system/system_error.hpp
branches/CMake/release/libs/system/include/boost/system/windows_error.hpp
- copied unchanged from r44009, /branches/CMake/release/boost/system/windows_error.hpp
Removed:
branches/CMake/release/boost/filesystem/
branches/CMake/release/boost/filesystem.hpp
branches/CMake/release/boost/graph/
branches/CMake/release/boost/system/
Text files modified:
branches/CMake/release/CMakeLists.txt | 6 +++---
branches/CMake/release/libs/filesystem/CMakeLists.txt | 1 +
branches/CMake/release/libs/graph/CMakeLists.txt | 1 +
branches/CMake/release/libs/python/CMakeLists.txt | 1 +
branches/CMake/release/libs/system/CMakeLists.txt | 1 +
branches/CMake/release/tools/build/CMake/BoostCore.cmake | 35 ++++++++++++++++++++++++++++++++++-
6 files changed, 41 insertions(+), 4 deletions(-)
Modified: branches/CMake/release/CMakeLists.txt
==============================================================================
--- branches/CMake/release/CMakeLists.txt (original)
+++ branches/CMake/release/CMakeLists.txt 2008-04-02 23:44:56 EDT (Wed, 02 Apr 2008)
@@ -24,8 +24,7 @@
# #
# For more information about CMake, see http://www.cmake.org #
##########################################################################
-cmake_minimum_required(VERSION 2.4.5 FATAL_ERROR)
-set(CMAKE_BACKWARDS_COMPATIBILITY 2.4)
+cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
project(Boost)
##########################################################################
@@ -168,5 +167,6 @@
add_subdirectory(libs)
# Add build rules for all of the Boost tools
-add_subdirectory(tools)
+# TODO: On hold while I work on the modularity code
+# add_subdirectory(tools)
##########################################################################
Deleted: branches/CMake/release/boost/filesystem.hpp
==============================================================================
--- branches/CMake/release/boost/filesystem.hpp 2008-04-02 23:44:56 EDT (Wed, 02 Apr 2008)
+++ (empty file)
@@ -1,20 +0,0 @@
-// boost/filesystem/filesystem.hpp -----------------------------------------//
-
-// Copyright Beman Dawes 2005
-
-// Use, modification, and distribution is subject to the Boost Software
-// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-// See library home page at http://www.boost.org/libs/filesystem
-
-//----------------------------------------------------------------------------//
-
-#ifndef BOOST_FILESYSTEM_FILESYSTEM_HPP
-#define BOOST_FILESYSTEM_FILESYSTEM_HPP
-
-#include <boost/filesystem/operations.hpp> // includes path.hpp
-#include <boost/filesystem/convenience.hpp>
-
-#endif
-
Modified: branches/CMake/release/libs/filesystem/CMakeLists.txt
==============================================================================
--- branches/CMake/release/libs/filesystem/CMakeLists.txt (original)
+++ branches/CMake/release/libs/filesystem/CMakeLists.txt 2008-04-02 23:44:56 EDT (Wed, 02 Apr 2008)
@@ -3,6 +3,7 @@
SRCDIRS src
TESTDIRS test
DEPENDS system
+ MODULAR
)
Modified: branches/CMake/release/libs/graph/CMakeLists.txt
==============================================================================
--- branches/CMake/release/libs/graph/CMakeLists.txt (original)
+++ branches/CMake/release/libs/graph/CMakeLists.txt 2008-04-02 23:44:56 EDT (Wed, 02 Apr 2008)
@@ -2,5 +2,6 @@
Graph
SRCDIRS src
TESTDIRS test
+ MODULAR
)
Modified: branches/CMake/release/libs/python/CMakeLists.txt
==============================================================================
--- branches/CMake/release/libs/python/CMakeLists.txt (original)
+++ branches/CMake/release/libs/python/CMakeLists.txt 2008-04-02 23:44:56 EDT (Wed, 02 Apr 2008)
@@ -62,5 +62,6 @@
Python
SRCDIRS src
TESTDIRS test
+ DEPENDS graph
)
endif (PYTHON_LIBRARIES)
Modified: branches/CMake/release/libs/system/CMakeLists.txt
==============================================================================
--- branches/CMake/release/libs/system/CMakeLists.txt (original)
+++ branches/CMake/release/libs/system/CMakeLists.txt 2008-04-02 23:44:56 EDT (Wed, 02 Apr 2008)
@@ -1,4 +1,5 @@
boost_library_project(
System
SRCDIRS src
+ MODULAR
)
\ 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-04-02 23:44:56 EDT (Wed, 02 Apr 2008)
@@ -24,7 +24,8 @@
# boost_library_project(libname
# [SRCDIRS srcdir1 srcdir2 ...]
# [TESTDIRS testdir1 testdir2 ...]
-# [DEPENDS lib1 lib2 ...])
+# [DEPENDS lib1 lib2 ...]
+# [MODULAR])
#
# where libname is the name of the library (e.g., Python, or
# Filesystem), srcdir1, srcdir2, etc, are subdirectories containing
@@ -35,6 +36,11 @@
# are not satisfied (e.g., because the library isn't present or its
# build is turned off), this library won't be built.
#
+# A library marked MODULAR has all of its header files in its own
+# subdirectory include/boost rather than the "global" boost
+# subdirectory. These libraries can be added or removed from the tree
+# freely; they do not need to be a part of the main repository.
+#
# For libraries that build actual library binaries, this macro adds a
# option BUILD_BOOST_LIBNAME (which defaults to ON). When the option
# is ON, this macro will include the source subdirectories, and
@@ -99,6 +105,33 @@
string(TOLOWER "${LIBNAME}" libname)
project(${libname})
+ if(THIS_PROJECT_MODULAR)
+ # If this is a modular project, set a variable
+ # BOOST_${LIBNAME}_IS_MODULAR in the *parent* scope, so that
+ # other libraries know that this is a modular library. Thus,
+ # they will add the appropriate include paths.
+ string(TOUPPER "BOOST_${LIBNAME}_IS_MODULAR" THIS_PROJECT_IS_MODULAR)
+ set(${THIS_PROJECT_IS_MODULAR} TRUE CACHE INTERNAL "" FORCE)
+
+ # Add this module's include directory
+ include_directories("${Boost_SOURCE_DIR}/libs/${libname}/include")
+
+ # Install this module's headers
+ install(DIRECTORY include/boost
+ DESTINATION ${BOOST_HEADER_DIR}
+ PATTERN "CVS" EXCLUDE
+ REGEX ".svn" EXCLUDE)
+ endif (THIS_PROJECT_MODULAR)
+
+ # For each of the modular libraries on which this project depends,
+ # add the include path for that library.
+ foreach(DEP ${THIS_PROJECT_DEPENDS})
+ string(TOUPPER "BOOST_${DEP}_IS_MODULAR" BOOST_LIB_DEP_MODULAR)
+ if(${BOOST_LIB_DEP_MODULAR})
+ include_directories("${Boost_SOURCE_DIR}/libs/${DEP}/include")
+ endif(${BOOST_LIB_DEP_MODULAR})
+ endforeach(DEP)
+
if(NOT EXISTS ${CMAKE_BINARY_DIR}/bin/tests)
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin/tests)
endif(NOT EXISTS ${CMAKE_BINARY_DIR}/bin/tests)
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