Branch for merging Boost.Build and Boost.Jam completely.

[SVN r59143]
rm cmake from trunk. I'm not entirely sure this is necessary to satisfy the inspect script, but I'm not taking any chances, and it is easy to put back
2026-02-07 23:45:37 +01:00 · 2010-01-19 20:47:20 +00:00 · 2009-10-17 02:07:38 +00:00 · 2009-07-26 00:49:56 +00:00 · 2009-04-29 21:19:12 +00:00 · 2009-04-05 20:46:02 +00:00
6 changed files with 3 additions and 46 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,22 +0,0 @@
-#----------------------------------------------------------------------------
-# This file was automatically generated from the original CMakeLists.txt file
-# Add a variable to hold the headers for the library
-set (lib_headers
-    range.hpp
-    range
-)
-
-# Add a library target to the build system
-boost_library_project(
-  range
-  #  SRCDIRS 
-  TESTDIRS  test
-  HEADERS ${lib_headers}
-  DOCDIRS  doc
-  DESCRIPTION  "A new infrastructure for generic algorithms that builds on top of the new iterator concepts."
-  MODULARIZED 
-  AUTHORS  "Thorsten Ottosen <nesotto -at- cs.auc.dk>"
-  #  MAINTAINERS 
-)
-
-
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1 +0,0 @@
-boost_add_documentation(boost_range.qbk)
--- a/doc/mfc_atl.html
+++ b/doc/mfc_atl.html
@@ -291,7 +291,7 @@ ul.auto-toc {
 </head>
 <body>
 <div class="document" id="boost-range-mfc-atl-extension">
-<h1 class="title"><img alt="Boost" src="http://www.boost.org/libs/ptr_container/doc/boost.png" /> Range MFC/ATL Extension</h1>
+<h1 class="title"><img alt="Boost" src="../../ptr_container/doc/boost.png" /> Range MFC/ATL Extension</h1>
 <table class="docinfo" frame="void" rules="none">
 <col class="docinfo-name" />
 <col class="docinfo-content" />
--- a/include/boost/range/as_literal.hpp
+++ b/include/boost/range/as_literal.hpp
@@ -38,7 +38,7 @@ namespace boost
            return strlen( s );
        }

-#ifndef BOOST_NO_INTRINSIC_WCHAR_T 
+#ifndef BOOST_NO_CWCHAR  
        inline std::size_t length( const wchar_t* s )
        {
            return wcslen( s );
@@ -61,7 +61,7 @@ namespace boost
            return true;
        }

-#ifndef BOOST_NO_INTRINSIC_WCHAR_T 
+#ifndef BOOST_NO_CWCHAR  
        inline bool is_char_ptr( wchar_t* )
        {
            return true;
--- a/module.cmake
+++ b/module.cmake
@@ -1 +0,0 @@
-boost_module(range DEPENDS algorithm)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,19 +0,0 @@
-boost_additional_test_dependencies(range BOOST_DEPENDS test)
-
-message(STATUS "libs/range/test: need -Wall -Wunused here when under gcc")
-set( test_compile_flags "")
-IF(CMAKE_COMPILER_IS_GNUCC)
-  SET(test_compile_flags "-Wall -Wunused")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
-
-boost_test_run(array DEPENDS boost_unit_test_framework COMPILE_FLAGS ${test_compile_flags})
-boost_test_run(iterator_pair DEPENDS boost_unit_test_framework COMPILE_FLAGS ${test_compile_flags})
-boost_test_run(std_container DEPENDS boost_unit_test_framework COMPILE_FLAGS ${test_compile_flags})
-boost_test_run(string DEPENDS boost_unit_test_framework COMPILE_FLAGS ${test_compile_flags})
-boost_test_run(iterator_range DEPENDS boost_unit_test_framework COMPILE_FLAGS ${test_compile_flags})
-boost_test_run(sub_range DEPENDS boost_unit_test_framework COMPILE_FLAGS ${test_compile_flags})
-boost_test_run(partial_workaround DEPENDS boost_unit_test_framework COMPILE_FLAGS ${test_compile_flags})
-boost_test_run(algorithm_example DEPENDS boost_unit_test_framework COMPILE_FLAGS ${test_compile_flags})
-boost_test_run(reversible_range DEPENDS boost_unit_test_framework COMPILE_FLAGS ${test_compile_flags})
-boost_test_run(const_ranges DEPENDS boost_unit_test_framework COMPILE_FLAGS ${test_compile_flags})
-boost_test_run(extension_mechanism DEPENDS boost_unit_test_framework COMPILE_FLAGS ${test_compile_flags})
Author	SHA1	Message	Date
Vladimir Prus	6ff8e23c2e	Branch for merging Boost.Build and Boost.Jam completely. [SVN r59143]	2010-01-19 20:47:20 +00:00
Troy D. Straszheim	1461479a17	rm cmake from trunk. I'm not entirely sure this is necessary to satisfy the inspect script, but I'm not taking any chances, and it is easy to put back [SVN r56942]	2009-10-17 02:07:38 +00:00
Troy D. Straszheim	7663f559f2	Copyrights on CMakeLists.txt to keep them from clogging up the inspect reports. This is essentially the same commit as r55095 on the release branch. [SVN r55159]	2009-07-26 00:49:56 +00:00
Daniel James	52b9581e4f	Use local copies of the boost logo. [SVN r52666]	2009-04-29 21:19:12 +00:00
Thorsten Jørgen Ottosen	bcc0ea30cf	Ticket #2903 [SVN r52202]	2009-04-05 20:46:02 +00:00