[Boost-commit] svn:boost r52811 - in branches/release: . libs/test tools/quickbook tools/wave

Subject: [Boost-commit] svn:boost r52811 - in branches/release: . libs/test tools/quickbook tools/wave
From: dgregor_at_[hidden]
Date: 2009-05-06 17:12:44

Author: dgregor
Date: 2009-05-06 17:12:42 EDT (Wed, 06 May 2009)
New Revision: 52811
URL: http://svn.boost.org/trac/boost/changeset/52811

Log:
Merge CMake fixes from the trunk
Text files modified: 
   branches/release/CMakeLists.txt                 |    14 ++++++++---                             
   branches/release/libs/test/module.cmake         |     2                                         
   branches/release/tools/quickbook/CMakeLists.txt |    49 ++++++++++++++++++++++++++------------- 
   branches/release/tools/wave/CMakeLists.txt      |    39 +++++++++++++++++++++++++++++++         
   branches/release/tools/wave/cpp.cpp             |     4 +-                                      
   5 files changed, 85 insertions(+), 23 deletions(-)

Modified: branches/release/CMakeLists.txt
==============================================================================
--- branches/release/CMakeLists.txt	(original)
+++ branches/release/CMakeLists.txt	2009-05-06 17:12:42 EDT (Wed, 06 May 2009)
@@ -234,11 +234,17 @@
 endif(WIN32 AND NOT UNIX)
 include(CPack)
 
-if(COMMAND cpack_configure_downloads)
-  cpack_configure_downloads(
-  "http://www.osl.iu.edu/~dgregor/Boost-CMake/${BOOST_VERSION}/"
-    ALL ADD_REMOVE)
+option(BOOST_INSTALLER_ON_THE_FLY
+       "Whether to build installers that download components on-the-fly" OFF)
+
+if (BOOST_INSTALLER_ON_THE_FLY)
+  if(COMMAND cpack_configure_downloads)
+    cpack_configure_downloads(
+    "http://www.osl.iu.edu/~dgregor/Boost-CMake/${BOOST_VERSION}/"
+      ALL ADD_REMOVE)
+  endif()
 endif()
+
 ##########################################################################
 
 ##########################################################################

Modified: branches/release/libs/test/module.cmake
==============================================================================
--- branches/release/libs/test/module.cmake	(original)
+++ branches/release/libs/test/module.cmake	2009-05-06 17:12:42 EDT (Wed, 06 May 2009)
@@ -1 +1 @@
-boost_module(test DEPENDS smart_ptr timer io bind)
+boost_module(test DEPENDS smart_ptr timer io bind numeric)

Modified: branches/release/tools/quickbook/CMakeLists.txt
==============================================================================
--- branches/release/tools/quickbook/CMakeLists.txt	(original)
+++ branches/release/tools/quickbook/CMakeLists.txt	2009-05-06 17:12:42 EDT (Wed, 06 May 2009)
@@ -8,21 +8,38 @@
     add_definitions(/wd4511 /wd4512 /wd4701 /wd4702 /wd4244 /wd4267 /wd4800)
   endif (MSVC)
   
-  #
-  # TDS: this needs fixing...  these are the modules that quickbook is
-  # dependent on, these paths should be set via some more generic
-  # mechanism
-  #
-  include_directories(
-    ${CMAKE_SOURCE_DIR}/libs/spirit/include
-    ${CMAKE_SOURCE_DIR}/libs/detail/include
-    ${CMAKE_SOURCE_DIR}/libs/config/include
-    ${CMAKE_SOURCE_DIR}/libs/type_traits/include
-    ${CMAKE_SOURCE_DIR}/libs/program_options/include
-    ${CMAKE_SOURCE_DIR}/libs/filesystem/include
-    ${CMAKE_SOURCE_DIR}/libs/system/include
-    )
-  
+#
+# TDS: this needs fixing...  these are the modules that quickbook is
+# dependent on.  if boost is modularized, you need these, but
+# they don't hurt if quickbook isn't modularized.
+#
+include_directories(
+  ${CMAKE_SOURCE_DIR}/libs/any/include
+  ${CMAKE_SOURCE_DIR}/libs/bind/include
+  ${CMAKE_SOURCE_DIR}/libs/concept/include
+  ${CMAKE_SOURCE_DIR}/libs/concept_check/include
+  ${CMAKE_SOURCE_DIR}/libs/config/include
+  ${CMAKE_SOURCE_DIR}/libs/detail/include
+  ${CMAKE_SOURCE_DIR}/libs/exception/include
+  ${CMAKE_SOURCE_DIR}/libs/filesystem/include
+  ${CMAKE_SOURCE_DIR}/libs/foreach/include
+  ${CMAKE_SOURCE_DIR}/libs/function/include
+  ${CMAKE_SOURCE_DIR}/libs/integer/include
+  ${CMAKE_SOURCE_DIR}/libs/iostreams/include
+  ${CMAKE_SOURCE_DIR}/libs/iterator/include
+  ${CMAKE_SOURCE_DIR}/libs/mpl/include
+  ${CMAKE_SOURCE_DIR}/libs/preprocessor/include
+  ${CMAKE_SOURCE_DIR}/libs/program_options/include
+  ${CMAKE_SOURCE_DIR}/libs/range/include
+  ${CMAKE_SOURCE_DIR}/libs/spirit/include
+  ${CMAKE_SOURCE_DIR}/libs/smart_ptr/include
+  ${CMAKE_SOURCE_DIR}/libs/static_assert/include
+  ${CMAKE_SOURCE_DIR}/libs/system/include
+  ${CMAKE_SOURCE_DIR}/libs/tuple/include
+  ${CMAKE_SOURCE_DIR}/libs/optional/include
+  ${CMAKE_SOURCE_DIR}/libs/type_traits/include
+  ${CMAKE_SOURCE_DIR}/libs/utility/include
+  )
 
   boost_add_executable(quickbook
     detail/quickbook.cpp
@@ -36,4 +53,4 @@
     detail/markups.cpp
     DEPENDS boost_program_options boost_filesystem
     )  
-endif (BUILD_QUICKBOOK)
\ No newline at end of file
+endif (BUILD_QUICKBOOK)

Modified: branches/release/tools/wave/CMakeLists.txt
==============================================================================
--- branches/release/tools/wave/CMakeLists.txt	(original)
+++ branches/release/tools/wave/CMakeLists.txt	2009-05-06 17:12:42 EDT (Wed, 06 May 2009)
@@ -1,3 +1,42 @@
+# DPG: tools need modular dependencies just like libraries have
+# them. For now, we just include the appropriate directories.
+
+include_directories(
+  ${CMAKE_SOURCE_DIR}/libs/algorithm/include
+  ${CMAKE_SOURCE_DIR}/libs/any/include
+  ${CMAKE_SOURCE_DIR}/libs/bind/include
+  ${CMAKE_SOURCE_DIR}/libs/concept/include
+  ${CMAKE_SOURCE_DIR}/libs/concept_check/include
+  ${CMAKE_SOURCE_DIR}/libs/config/include
+  ${CMAKE_SOURCE_DIR}/libs/date_time/include
+  ${CMAKE_SOURCE_DIR}/libs/detail/include
+  ${CMAKE_SOURCE_DIR}/libs/exception/include
+  ${CMAKE_SOURCE_DIR}/libs/filesystem/include
+  ${CMAKE_SOURCE_DIR}/libs/function/include
+  ${CMAKE_SOURCE_DIR}/libs/integer/include
+  ${CMAKE_SOURCE_DIR}/libs/intrusive/include
+  ${CMAKE_SOURCE_DIR}/libs/io/include
+  ${CMAKE_SOURCE_DIR}/libs/iterator/include
+  ${CMAKE_SOURCE_DIR}/libs/mpl/include
+  ${CMAKE_SOURCE_DIR}/libs/multi_index/include
+  ${CMAKE_SOURCE_DIR}/libs/optional/include
+  ${CMAKE_SOURCE_DIR}/libs/preprocessor/include
+  ${CMAKE_SOURCE_DIR}/libs/program_options/include
+  ${CMAKE_SOURCE_DIR}/libs/pool/include
+  ${CMAKE_SOURCE_DIR}/libs/range/include
+  ${CMAKE_SOURCE_DIR}/libs/serialization/include
+  ${CMAKE_SOURCE_DIR}/libs/smart_ptr/include
+  ${CMAKE_SOURCE_DIR}/libs/spirit/include
+  ${CMAKE_SOURCE_DIR}/libs/static_assert/include
+  ${CMAKE_SOURCE_DIR}/libs/system/include
+  ${CMAKE_SOURCE_DIR}/libs/thread/include
+  ${CMAKE_SOURCE_DIR}/libs/timer/include
+  ${CMAKE_SOURCE_DIR}/libs/tuple/include
+  ${CMAKE_SOURCE_DIR}/libs/type_traits/include
+  ${CMAKE_SOURCE_DIR}/libs/utility/include
+  ${CMAKE_SOURCE_DIR}/libs/wave/include
+)
+
 boost_add_executable(wave cpp.cpp 
   DEPENDS boost_wave boost_program_options boost_filesystem boost_serialization
   MULTI_THREADED

Modified: branches/release/tools/wave/cpp.cpp
==============================================================================
--- branches/release/tools/wave/cpp.cpp	(original)
+++ branches/release/tools/wave/cpp.cpp	2009-05-06 17:12:42 EDT (Wed, 06 May 2009)
@@ -799,7 +799,7 @@
 
     // add include directories to the system include search paths
         if (vm.count("sysinclude")) {
-        vector<std::string> syspaths = vm["sysinclude"].as<vector<string> >();
+          vector<std::string> syspaths = vm["sysinclude"].as<vector<std::string> >();
 
             vector<std::string>::const_iterator end = syspaths.end();
             for (vector<std::string>::const_iterator cit = syspaths.begin(); 
@@ -836,7 +836,7 @@
     
     // add additional defined macros 
         if (vm.count("define")) {
-            vector<std::string> const &macros = vm["define"].as<vector<string> >();
+          vector<std::string> const &macros = vm["define"].as<vector<std::string> >();
             vector<std::string>::const_iterator end = macros.end();
             for (vector<std::string>::const_iterator cit = macros.begin(); 
                  cit != end; ++cit)