[Boost-commit] svn:boost r52959 - in trunk/libs/spirit: . example/karma example/lex example/qi test

Subject: [Boost-commit] svn:boost r52959 - in trunk/libs/spirit: . example/karma example/lex example/qi test
From: troy_at_[hidden]
Date: 2009-05-13 01:40:21

Author: troy
Date: 2009-05-13 01:40:19 EDT (Wed, 13 May 2009)
New Revision: 52959
URL: http://svn.boost.org/trac/boost/changeset/52959

Log:

tune up spirit-cmake

Added:
   trunk/libs/spirit/example/karma/CMakeLists.txt   (contents, props changed)
   trunk/libs/spirit/example/lex/CMakeLists.txt   (contents, props changed)
   trunk/libs/spirit/example/qi/CMakeLists.txt   (contents, props changed)
Text files modified: 
   trunk/libs/spirit/CMakeLists.txt      |    22 +++++++---------------                  
   trunk/libs/spirit/test/CMakeLists.txt |     6 ++++--                                  
   2 files changed, 11 insertions(+), 17 deletions(-)

Modified: trunk/libs/spirit/CMakeLists.txt
==============================================================================
--- trunk/libs/spirit/CMakeLists.txt	(original)
+++ trunk/libs/spirit/CMakeLists.txt	2009-05-13 01:40:19 EDT (Wed, 13 May 2009)
@@ -1,23 +1,15 @@
-#----------------------------------------------------------------------------
-# This file was automatically generated from the original CMakeLists.txt file
-# Add a variable to hold the headers for the library
-set (lib_headers
-    spirit.hpp
-    spirit
-)
-
 # Add a library target to the build system
 boost_library_project(
   spirit
-  #  SRCDIRS 
-  TESTDIRS  test
-  HEADERS ${lib_headers}
+  SRCDIRS     example/karma example/qi example/lex
+  TESTDIRS    test
+  HEADERS     spirit.hpp spirit
   #  DOCDIRS 
-  DESCRIPTION  "A object oriented, recursive-descent parser and output generation library using the syntax of Parsing Expression Grammars (PEGs) directly in C++"
+  DESCRIPTION "A object oriented, recursive-descent parser and output generation library using the syntax of Parsing Expression Grammars (PEGs) directly in C++"
   MODULARIZED
-  AUTHORS  "Joel de Guzman <joel -at- boost-consulting.com>"
-           "Hartmut Kaiser <hartmut.kaiser -at- gmail.com>"
-           "Dan Nuffer"
+  AUTHORS     "Joel de Guzman <joel -at- boost-consulting.com>"
+              "Hartmut Kaiser <hartmut.kaiser -at- gmail.com>"
+              "Dan Nuffer"
   #  MAINTAINERS 
 )
 

Added: trunk/libs/spirit/example/karma/CMakeLists.txt
==============================================================================
--- (empty file)
+++ trunk/libs/spirit/example/karma/CMakeLists.txt	2009-05-13 01:40:19 EDT (Wed, 13 May 2009)
@@ -0,0 +1,11 @@
+
+boost_add_executable(quick_start1)
+boost_add_executable(actions)
+boost_add_executable(basic_facilities DEPENDS boost_date_time)
+boost_add_executable(calc2_ast_dump)
+boost_add_executable(calc2_ast_rpn)
+boost_add_executable(calc2_ast_vm)
+boost_add_executable(mini_xml_karma)
+
+
+

Added: trunk/libs/spirit/example/lex/CMakeLists.txt
==============================================================================
--- (empty file)
+++ trunk/libs/spirit/example/lex/CMakeLists.txt	2009-05-13 01:40:19 EDT (Wed, 13 May 2009)
@@ -0,0 +1,15 @@
+
+boost_add_executable(example1)
+boost_add_executable(example2)
+boost_add_executable(example3)
+boost_add_executable(example4)
+boost_add_executable(example5)
+boost_add_executable(example6)
+boost_add_executable(print_numbers)
+boost_add_executable(word_count)
+boost_add_executable(word_count_functor)
+boost_add_executable(word_count_lexer)
+boost_add_executable(word_count_functor_flex)
+boost_add_executable(strip_comments)
+boost_add_executable(strip_comments_lexer)
+

Added: trunk/libs/spirit/example/qi/CMakeLists.txt
==============================================================================
--- (empty file)
+++ trunk/libs/spirit/example/qi/CMakeLists.txt	2009-05-13 01:40:19 EDT (Wed, 13 May 2009)
@@ -0,0 +1,56 @@
+#==============================================================================
+#   Copyright (c) 2001-2007 Joel de Guzman
+#
+#   Distributed under 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)
+#==============================================================================
+# project spirit-qi-example
+#     : requirements <toolset>gcc:<c++-template-depth>300
+#     :
+#     :
+#     ;
+
+boost_add_executable(actions_ actions.cpp)
+boost_add_executable( sum  sum.cpp )
+boost_add_executable( complex_number  complex_number.cpp )
+boost_add_executable( employee  employee.cpp  )
+boost_add_executable( roman  roman.cpp )
+boost_add_executable( mini_xml1  mini_xml1.cpp )
+boost_add_executable( mini_xml2  mini_xml2.cpp )
+boost_add_executable( mini_xml3  mini_xml3.cpp )
+boost_add_executable( num_list1  num_list1.cpp )
+boost_add_executable( num_list2  num_list2.cpp )
+boost_add_executable( num_list3  num_list3.cpp )
+boost_add_executable( num_list4  num_list4.cpp )
+
+boost_add_executable( calc1  calc1.cpp )
+boost_add_executable( calc2  calc2.cpp )
+boost_add_executable( calc2_ast  calc2_ast.cpp )
+boost_add_executable( calc3  calc3.cpp )
+# boost_add_executable( calc3_lexer  calc3_lexer.cpp )
+boost_add_executable( calc4  calc4.cpp )
+boost_add_executable( calc4_debug  calc4_debug.cpp )
+boost_add_executable( calc5  calc5.cpp )
+
+boost_add_executable( calc6 
+     calc6/calc6.cpp
+     calc6/calc6a.cpp
+     calc6/calc6b.cpp
+     calc6/calc6c.cpp
+     )
+
+boost_add_executable( calc7 
+     calc7/calc7.cpp
+     calc7/calc7a.cpp
+     calc7/calc7b.cpp
+     calc7/calc7c.cpp
+     )
+
+boost_add_executable( mini_c 
+     mini_c/mini_c.cpp
+     mini_c/mini_ca.cpp
+     mini_c/mini_cb.cpp
+     mini_c/mini_cc.cpp
+     mini_c/mini_cd.cpp
+     )
+

Modified: trunk/libs/spirit/test/CMakeLists.txt
==============================================================================
--- trunk/libs/spirit/test/CMakeLists.txt	(original)
+++ trunk/libs/spirit/test/CMakeLists.txt	2009-05-13 01:40:19 EDT (Wed, 13 May 2009)
@@ -6,6 +6,8 @@
 #   http://www.boost.org/LICENSE_1_0.txt)
 #==============================================================================
 
+include_directories(.)
+
 boost_additional_test_dependencies(spirit BOOST_DEPENDS test variant function_types intrusive lambda assign iostreams math random dynamic_bitset fusion)
 message(STATUS "Boost/libs/spirit/test needs GCC C++ -ftemplate-depth-300 flag")
 
@@ -100,8 +102,8 @@
 boost_test_run(lex_lexertl5 lex/lexertl5.cpp COMPILE_FLAGS ${test_compile_flags})
 boost_test_run(lex_state_switcher_test lex/state_switcher_test.cpp COMPILE_FLAGS ${test_compile_flags})
 
-boost_test_run(lex_regression001 lex/lex_regression001.cpp COMPILE_FLAGS ${test_compile_flags})
-boost_test_run(lex_regression002 lex/lex_regression002.cpp COMPILE_FLAGS ${test_compile_flags})
+boost_test_run(lex_regression001 lex/regression001.cpp COMPILE_FLAGS ${test_compile_flags})
+boost_test_run(lex_regression002 lex/regression002.cpp COMPILE_FLAGS ${test_compile_flags})
 
 # run support tests
 # boost_test_run(support_hold_any support/hold_any.cpp COMPILE_FLAGS ${test_compile_flags})