diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01de5f5..d140284 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,11 @@
-# Copyright 2019 Peter Dimov
+# Generated by `boostdep --cmake function`
+# Copyright 2020 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
+# https://www.boost.org/LICENSE_1_0.txt
 
-# Partial (add_subdirectory only) and experimental CMake support
-# Subject to change; please do not rely on the contents of this file yet
+cmake_minimum_required(VERSION 3.5...3.16)
 
-cmake_minimum_required(VERSION 3.5)
-project(BoostFunction LANGUAGES CXX)
+project(boost_function VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
 
 add_library(boost_function INTERFACE)
 add_library(Boost::function ALIAS boost_function)
@@ -14,15 +13,22 @@ add_library(Boost::function ALIAS boost_function)
 target_include_directories(boost_function INTERFACE include)
 
 target_link_libraries(boost_function
-    INTERFACE
-        Boost::assert
-        Boost::bind
-        Boost::config
-        Boost::core
-        Boost::integer
-        Boost::preprocessor
-        Boost::throw_exception
-        Boost::type_index
-        Boost::type_traits
-        Boost::typeof
+  INTERFACE
+    Boost::assert
+    Boost::bind
+    Boost::config
+    Boost::core
+    Boost::integer
+    Boost::preprocessor
+    Boost::throw_exception
+    Boost::type_index
+    Boost::type_traits
+    Boost::typeof
 )
+
+if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
+
+  add_subdirectory(test)
+
+endif()
+