[Boost-commit] svn:boost r52802 - trunk/tools/wave

Subject: [Boost-commit] svn:boost r52802 - trunk/tools/wave
From: dgregor_at_[hidden]
Date: 2009-05-06 11:17:52

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

Log:
Add includes needed to build the wave preprocessor executable with a modularized tree
Text files modified: 
   trunk/tools/wave/CMakeLists.txt |    39 +++++++++++++++++++++++++++++++++++++++ 
   trunk/tools/wave/cpp.cpp        |     4 ++--                                    
   2 files changed, 41 insertions(+), 2 deletions(-)

Modified: trunk/tools/wave/CMakeLists.txt
==============================================================================
--- trunk/tools/wave/CMakeLists.txt	(original)
+++ trunk/tools/wave/CMakeLists.txt	2009-05-06 11:17:51 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: trunk/tools/wave/cpp.cpp
==============================================================================
--- trunk/tools/wave/cpp.cpp	(original)
+++ trunk/tools/wave/cpp.cpp	2009-05-06 11:17:51 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)