Update test/cmake_subdir_test

CMakeLists.txt

@@ -1,9 +1,9 @@
 # Generated by `boostdep --cmake function`
-# Copyright 2020 Peter Dimov
+# Copyright 2020, 2021 Peter Dimov
 # Distributed under the Boost Software License, Version 1.0.
 # https://www.boost.org/LICENSE_1_0.txt
 
-cmake_minimum_required(VERSION 3.5...3.16)
+cmake_minimum_required(VERSION 3.5...3.20)
 
 project(boost_function VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
 
@@ -18,7 +18,6 @@ target_link_libraries(boost_function
     Boost::bind
     Boost::config
     Boost::core
-    Boost::integer
     Boost::preprocessor
     Boost::throw_exception
     Boost::type_index
@@ -31,4 +30,3 @@ if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
   add_subdirectory(test)
 
 endif()
-

include/boost/function/function_base.hpp

@@ -17,7 +17,6 @@
 #include <new>
 #include <boost/config.hpp>
 #include <boost/assert.hpp>
-#include <boost/integer.hpp>
 #include <boost/type_index.hpp>
 #include <boost/type_traits/has_trivial_copy.hpp>
 #include <boost/type_traits/has_trivial_destructor.hpp>

test/cmake_subdir_test/CMakeLists.txt

@@ -2,39 +2,39 @@
 # 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)
+cmake_minimum_required(VERSION 3.5...3.20)
 
 project(cmake_subdir_test LANGUAGES CXX)
 
 add_subdirectory(../.. boostorg/function)
 
-# boost_add_subdir
+set(deps
 
-function(boost_add_subdir name)
+# Primary dependencies
 
-    add_subdirectory(../../../${name} boostorg/${name})
+assert
+bind
+config
+core
+preprocessor
+throw_exception
+type_index
+type_traits
+typeof
 
-endfunction()
+# Secondary dependencies
 
-# primary dependencies
+static_assert
+container_hash
+describe
+mp11
+)
 
-boost_add_subdir(assert)
+foreach(dep IN LISTS deps)
-boost_add_subdir(bind)
-boost_add_subdir(config)
-boost_add_subdir(core)
-boost_add_subdir(integer)
-boost_add_subdir(preprocessor)
-boost_add_subdir(throw_exception)
-boost_add_subdir(type_index)
-boost_add_subdir(type_traits)
-boost_add_subdir(typeof)
 
-# secondary dependencies
+  add_subdirectory(../../../${dep} boostorg/${dep})
 
-boost_add_subdir(static_assert)
+endforeach()
-boost_add_subdir(container_hash)
-boost_add_subdir(describe)
-boost_add_subdir(mp11)
 
 # --target check