Merge branch 'develop' into CMake

jeremy-murphy · jeremy-murphy · commit 3a51b37063b7 · 2024-12-21T09:15:28.000+11:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -176,3 +176,227 @@ jobs:
       - name: Test
         run: ..\..\..\b2 --hash address-model=64 cxxstd=14,17,20 toolset=msvc-14.3
         working-directory: ../boost-root/libs/graph/test
+
+  posix-cmake-subdir:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-20.04
+          - os: ubuntu-22.04
+          - os: ubuntu-24.04
+          - os: macos-13
+          - os: macos-14
+          - os: macos-15
+
+    runs-on: ${{matrix.os}}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install packages
+        if: matrix.install
+        run: sudo apt-get -y install ${{matrix.install}}
+
+      - name: Setup Boost
+        run: |
+          echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY
+          LIBRARY=${GITHUB_REPOSITORY#*/}
+          echo LIBRARY: $LIBRARY
+          echo "LIBRARY=$LIBRARY" >> $GITHUB_ENV
+          echo GITHUB_BASE_REF: $GITHUB_BASE_REF
+          echo GITHUB_REF: $GITHUB_REF
+          REF=${GITHUB_BASE_REF:-$GITHUB_REF}
+          REF=${REF#refs/heads/}
+          echo REF: $REF
+          BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
+          echo BOOST_BRANCH: $BOOST_BRANCH
+          cd ..
+          git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
+          cd boost-root
+          cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
+          git submodule update --init tools/boostdep
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
+
+      - name: Use library with add_subdirectory
+        run: |
+          cd ../boost-root/libs/$LIBRARY/test/cmake_subdir_test
+          mkdir __build__ && cd __build__
+          cmake ..
+          cmake --build .
+          ctest --output-on-failure --no-tests=error
+
+  posix-cmake-install:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-20.04
+          - os: ubuntu-22.04
+          - os: ubuntu-24.04
+          - os: macos-13
+          - os: macos-14
+          - os: macos-15
+
+    runs-on: ${{matrix.os}}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install packages
+        if: matrix.install
+        run: sudo apt-get -y install ${{matrix.install}}
+
+      - name: Setup Boost
+        run: |
+          echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY
+          LIBRARY=${GITHUB_REPOSITORY#*/}
+          echo LIBRARY: $LIBRARY
+          echo "LIBRARY=$LIBRARY" >> $GITHUB_ENV
+          echo GITHUB_BASE_REF: $GITHUB_BASE_REF
+          echo GITHUB_REF: $GITHUB_REF
+          REF=${GITHUB_BASE_REF:-$GITHUB_REF}
+          REF=${REF#refs/heads/}
+          echo REF: $REF
+          BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
+          echo BOOST_BRANCH: $BOOST_BRANCH
+          cd ..
+          git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
+          cd boost-root
+          cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
+          git submodule update --init tools/boostdep
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
+
+      - name: Configure
+        run: |
+          cd ../boost-root
+          mkdir __build__ && cd __build__
+          cmake -DBOOST_INCLUDE_LIBRARIES=$LIBRARY -DCMAKE_INSTALL_PREFIX=~/.local ..
+
+      - name: Install
+        run: |
+          cd ../boost-root/__build__
+          cmake --build . --target install
+
+      - name: Use the installed library
+        run: |
+          cd ../boost-root/libs/$LIBRARY/test/cmake_install_test && mkdir __build__ && cd __build__
+          cmake -DCMAKE_INSTALL_PREFIX=~/.local ..
+          cmake --build .
+          ctest --output-on-failure --no-tests=error
+
+  windows-cmake-subdir:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: windows-2019
+          - os: windows-2022
+
+    runs-on: ${{matrix.os}}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Boost
+        shell: cmd
+        run: |
+          echo GITHUB_REPOSITORY: %GITHUB_REPOSITORY%
+          for /f %%i in ("%GITHUB_REPOSITORY%") do set LIBRARY=%%~nxi
+          echo LIBRARY: %LIBRARY%
+          echo LIBRARY=%LIBRARY%>>%GITHUB_ENV%
+          echo GITHUB_BASE_REF: %GITHUB_BASE_REF%
+          echo GITHUB_REF: %GITHUB_REF%
+          if "%GITHUB_BASE_REF%" == "" set GITHUB_BASE_REF=%GITHUB_REF%
+          set BOOST_BRANCH=develop
+          for /f %%i in ("%GITHUB_BASE_REF%") do if "%%~nxi" == "master" set BOOST_BRANCH=master
+          echo BOOST_BRANCH: %BOOST_BRANCH%
+          cd ..
+          git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
+          cd boost-root
+          xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
+          git submodule update --init tools/boostdep
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY%
+
+      - name: Use library with add_subdirectory (Debug)
+        shell: cmd
+        run: |
+          cd ../boost-root/libs/%LIBRARY%/test/cmake_subdir_test
+          mkdir __build__ && cd __build__
+          cmake ..
+          cmake --build . --config Debug
+          ctest --output-on-failure --no-tests=error -C Debug
+
+      - name: Use library with add_subdirectory (Release)
+        shell: cmd
+        run: |
+          cd ../boost-root/libs/%LIBRARY%/test/cmake_subdir_test/__build__
+          cmake --build . --config Release
+          ctest --output-on-failure --no-tests=error -C Release
+
+  windows-cmake-install:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: windows-2019
+          - os: windows-2022
+
+    runs-on: ${{matrix.os}}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Boost
+        shell: cmd
+        run: |
+          echo GITHUB_REPOSITORY: %GITHUB_REPOSITORY%
+          for /f %%i in ("%GITHUB_REPOSITORY%") do set LIBRARY=%%~nxi
+          echo LIBRARY: %LIBRARY%
+          echo LIBRARY=%LIBRARY%>>%GITHUB_ENV%
+          echo GITHUB_BASE_REF: %GITHUB_BASE_REF%
+          echo GITHUB_REF: %GITHUB_REF%
+          if "%GITHUB_BASE_REF%" == "" set GITHUB_BASE_REF=%GITHUB_REF%
+          set BOOST_BRANCH=develop
+          for /f %%i in ("%GITHUB_BASE_REF%") do if "%%~nxi" == "master" set BOOST_BRANCH=master
+          echo BOOST_BRANCH: %BOOST_BRANCH%
+          cd ..
+          git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
+          cd boost-root
+          xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
+          git submodule update --init tools/boostdep
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY%
+
+      - name: Configure
+        shell: cmd
+        run: |
+          cd ../boost-root
+          mkdir __build__ && cd __build__
+          cmake -DBOOST_INCLUDE_LIBRARIES=%LIBRARY% -DCMAKE_INSTALL_PREFIX=C:/cmake-prefix ..
+
+      - name: Install (Debug)
+        shell: cmd
+        run: |
+          cd ../boost-root/__build__
+          cmake --build . --target install --config Debug
+
+      - name: Install (Release)
+        shell: cmd
+        run: |
+          cd ../boost-root/__build__
+          cmake --build . --target install --config Release
+
+      - name: Use the installed library (Debug)
+        shell: cmd
+        run: |
+          cd ../boost-root/libs/%LIBRARY%/test/cmake_install_test && mkdir __build__ && cd __build__
+          cmake -DCMAKE_INSTALL_PREFIX=C:/cmake-prefix ..
+          cmake --build . --config Debug
+          ctest --output-on-failure --no-tests=error -C Debug
+
+      - name: Use the installed library (Release)
+        shell: cmd
+        run: |
+          cd ../boost-root/libs/%LIBRARY%/test/cmake_install_test/__build__
+          cmake --build . --config Release
+          ctest --output-on-failure --no-tests=error -C Release
diff --git a/doc/using_adjacency_list.html b/doc/using_adjacency_list.html
@@ -133,7 +133,7 @@ <H4>Time Complexity</H4>
 <PRE>
 vertex()
 </PRE>
-This operation is constant time for <TT>vecS</TT> and  for
+This operation is constant time for <TT>vecS</TT> and <i>O(V)</i> for
 <TT>listS</TT>.
 
 </ul>
diff --git a/example/fibonacci_heap.cpp b/example/fibonacci_heap.cpp
@@ -34,7 +34,7 @@ int main()
         uniform_int<> distrib(0, N - 1);
         boost::variate_generator< random_ns::mt19937&, uniform_int<> > rand_gen(
             gen, distrib);
-        for (int t = 0; t < 10; ++t)
+        for (std::size_t t = 0; t < 10; ++t)
         {
             std::vector< float > v, w(N);
 
diff --git a/example/graph-thingie.cpp b/example/graph-thingie.cpp
@@ -14,6 +14,7 @@
 #include <boost/foreach.hpp>
 #include <string>
 #include <sstream>
+#include <cstdlib>
 
 using namespace boost;
 using namespace std;
@@ -104,5 +105,5 @@ int main()
              << get("label", dp, v) << ")\n";
     }
 
-    return 0;
+    return status ? EXIT_SUCCESS : EXIT_FAILURE;
 }
diff --git a/example/prim-telephone.cpp b/example/prim-telephone.cpp
@@ -53,12 +53,12 @@ int main()
 #endif
 
     int total_weight = 0;
-    for (int v = 0; v < num_vertices(g); ++v)
+    for (std::size_t v = 0; v < num_vertices(g); ++v)
         if (parent[v] != v)
             total_weight += get(weight, edge(parent[v], v, g).first);
     std::cout << "total weight: " << total_weight << std::endl;
 
-    for (int u = 0; u < num_vertices(g); ++u)
+    for (std::size_t u = 0; u < num_vertices(g); ++u)
         if (parent[u] != u)
             edge_attr_map[edge(parent[u], u, g_dot).first]["color"] = "black";
     std::ofstream out("figs/telephone-mst-prim.dot");
diff --git a/include/boost/graph/bron_kerbosch_all_cliques.hpp b/include/boost/graph/bron_kerbosch_all_cliques.hpp
@@ -104,7 +104,7 @@ struct max_clique_visitor
     max_clique_visitor(std::size_t& max) : maximum(max) {}
 
     template < typename Clique, typename Graph >
-    inline void clique(const Clique& p, const Graph& g)
+    inline void clique(const Clique& p, const Graph&)
     {
         BOOST_USING_STD_MAX();
         maximum = max BOOST_PREVENT_MACRO_SUBSTITUTION(maximum, p.size());
@@ -220,7 +220,7 @@ namespace detail
 
         // otherwise, iterate over candidates and and test
         // for maxmimal cliquiness.
-        typename Container::iterator i, j;
+        typename Container::iterator i;
         for (i = cands.begin(); i != cands.end();)
         {
             Vertex candidate = *i;
diff --git a/include/boost/graph/cycle_canceling.hpp b/include/boost/graph/cycle_canceling.hpp
@@ -172,7 +172,7 @@ namespace detail
 template < class Graph, class P, class T, class R >
 void cycle_canceling(Graph& g, const bgl_named_params< P, T, R >& params)
 {
-    cycle_canceling_dispatch1(g,
+    detail::cycle_canceling_dispatch1(g,
         choose_const_pmap(get_param(params, edge_weight), g, edge_weight),
         choose_const_pmap(get_param(params, edge_reverse), g, edge_reverse),
         choose_pmap(get_param(params, edge_residual_capacity), g,
diff --git a/include/boost/graph/dominator_tree.hpp b/include/boost/graph/dominator_tree.hpp
@@ -10,8 +10,8 @@
 #define BOOST_GRAPH_DOMINATOR_HPP
 
 #include <boost/config.hpp>
-#include <deque>
 #include <set>
+#include <vector>
 #include <boost/graph/depth_first_search.hpp>
 #include <boost/concept/assert.hpp>
 
@@ -155,7 +155,7 @@ namespace detail
             //
             //  idom(n) = semi(n) if semi(y)=semi(n) or
             //            idom(y) if semi(y) != semi(n)
-            typename std::deque< Vertex >::iterator buckItr;
+            typename std::vector< Vertex >::iterator buckItr;
             for (buckItr = get(bucketMap_, p).begin();
                  buckItr != get(bucketMap_, p).end(); ++buckItr)
             {
@@ -195,10 +195,10 @@ namespace detail
 
         std::vector< Vertex > semi_, ancestor_, samedom_, best_;
         PredMap semiMap_, ancestorMap_, bestMap_;
-        std::vector< std::deque< Vertex > > buckets_;
+        std::vector< std::vector< Vertex > > buckets_;
 
         iterator_property_map<
-            typename std::vector< std::deque< Vertex > >::iterator, IndexMap >
+            typename std::vector< std::vector< Vertex > >::iterator, IndexMap >
             bucketMap_;
 
         const Vertex& entry_;
diff --git a/test/cmake_install_test/CMakeLists.txt b/test/cmake_install_test/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Copyright 2018, 2019, 2021 Peter Dimov
+# 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
+
+cmake_minimum_required(VERSION 3.5...3.16)
+
+project(boost_graph_install_test LANGUAGES CXX)
+
+if(BOOST_RUNTIME_LINK STREQUAL "static")
+  set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+endif()
+
+find_package(boost_graph REQUIRED)
+
+add_executable(main main.cpp)
+target_link_libraries(main Boost::graph)
+
+enable_testing()
+add_test(NAME main COMMAND main)
+
+add_custom_target(check VERBATIM COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure --no-tests=error -C $<CONFIG>)
diff --git a/test/cmake_install_test/main.cpp b/test/cmake_install_test/main.cpp
@@ -0,0 +1,24 @@
+// Copyright 2006 The Trustees of Indiana University.
+
+// 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)
+
+//  Authors: Douglas Gregor
+//           Andrew Lumsdaine
+
+// Make sure adjacency_list works with EdgeListS=setS
+#include <boost/graph/adjacency_list.hpp>
+
+using namespace boost;
+
+typedef adjacency_list< vecS, vecS, undirectedS, no_property, no_property,
+    no_property, setS >
+    GraphType;
+
+int main()
+{
+    GraphType g(10);
+    add_vertex(g);
+    add_edge(0, 5, g);
+}
diff --git a/test/cmake_subdir_test/CMakeLists.txt b/test/cmake_subdir_test/CMakeLists.txt
diff --git a/test/cmake_subdir_test/main.cpp b/test/cmake_subdir_test/main.cpp

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ int main()`
`34`	`34`	`uniform_int<> distrib(0, N - 1);`
`35`	`35`	`boost::variate_generator< random_ns::mt19937&, uniform_int<> > rand_gen(`
`36`	`36`	`gen, distrib);`
`37`		`- for (int t = 0; t < 10; ++t)`
	`37`	`+ for (std::size_t t = 0; t < 10; ++t)`
`38`	`38`	`{`
`39`	`39`	`std::vector< float > v, w(N);`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`#include <boost/foreach.hpp>`
`15`	`15`	`#include <string>`
`16`	`16`	`#include <sstream>`
	`17`	`+#include <cstdlib>`
`17`	`18`
`18`	`19`	`using namespace boost;`
`19`	`20`	`using namespace std;`
`@@ -104,5 +105,5 @@ int main()`
`104`	`105`	`<< get("label", dp, v) << ")\n";`
`105`	`106`	`}`
`106`	`107`
`107`		`- return 0;`
	`108`	`+ return status ? EXIT_SUCCESS : EXIT_FAILURE;`
`108`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ namespace detail`
`172`	`172`	`template < class Graph, class P, class T, class R >`
`173`	`173`	`void cycle_canceling(Graph& g, const bgl_named_params< P, T, R >& params)`
`174`	`174`	`{`
`175`		`- cycle_canceling_dispatch1(g,`
	`175`	`+ detail::cycle_canceling_dispatch1(g,`
`176`	`176`	`choose_const_pmap(get_param(params, edge_weight), g, edge_weight),`
`177`	`177`	`choose_const_pmap(get_param(params, edge_reverse), g, edge_reverse),`
`178`	`178`	`choose_pmap(get_param(params, edge_residual_capacity), g,`