Update tests/CMakeLists.txt

CMakeLists.txt

@@ -1,36 +1,34 @@
-# Copyright 2019 Mike Dev
+# Generated by `boostdep --cmake parameter`
+# Copyright 2020 Peter Dimov
 # Distributed under the Boost Software License, Version 1.0.
-# See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt
-#
-# NOTE: CMake support for Boost.Parameter is currently experimental at best
-#       and the interface is likely to change in the future
+# https://www.boost.org/LICENSE_1_0.txt
 
-cmake_minimum_required( VERSION 3.5 )
-project( BoostParameter LANGUAGES CXX)
+cmake_minimum_required(VERSION 3.5...3.16)
 
-option(BOOST_PARAMETER_INCLUDE_TESTS OFF "Include Boost.Parameter tests")
+project(boost_parameter VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
 
-add_library( boost_parameter INTERFACE )
-add_library( Boost::parameter ALIAS boost_parameter )
+add_library(boost_parameter INTERFACE)
+add_library(Boost::parameter ALIAS boost_parameter)
 
-target_include_directories( boost_parameter INTERFACE include )
+target_include_directories(boost_parameter INTERFACE include)
 
-target_link_libraries( boost_parameter
-    INTERFACE
-        Boost::config
-        Boost::core
-        Boost::function
-        Boost::fusion
-        # TODO: we only need mp11 or mpl
-        Boost::mp11
-        Boost::mpl
-        Boost::optional
-        Boost::preprocessor
-        Boost::type_traits
-        Boost::utility
+target_link_libraries(boost_parameter
+  INTERFACE
+    Boost::config
+    Boost::core
+    Boost::function
+    Boost::fusion
+    Boost::mp11
+    Boost::mpl
+    Boost::optional
+    Boost::preprocessor
+    Boost::type_traits
+    Boost::utility
 )
 
-if(BOOST_PARAMETER_INCLUDE_TESTS)
-    enable_testing()
-    add_subdirectory(test)
+if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
+
+  add_subdirectory(test)
+
 endif()
+

test/CMakeLists.txt

@@ -8,20 +8,30 @@
 # TODO: Also process literate tests
 file(GLOB test_files *.cpp)
 
-# remove some test for which the dependencies are not yet available or have special requirements
+# remove some test for which the dependencies are not yet available or have
+# special requirements
 # TODO: enable more tests
 list(FILTER test_files EXCLUDE REGEX
     efficiency|deduced_unmatched_arg|python_test|duplicates)
 
+# Attach all our tests to the `tests` target, to enable
+# `cmake --build . --target tests`
+if(NOT TARGET tests)
+  add_custom_target(tests)
+endif()
+
 foreach(file IN LISTS test_files)
 
     get_filename_component(core_name ${file} NAME_WE)
-    set(test_name test_boost_parameter_${core_name})
+    set(test_name boost_parameter-test-${core_name})
 
-    add_executable(${test_name} ${file})
-    # add Boost.Parameter and any libraries that are only needed by the tests (none at the moment)
+    add_executable(${test_name} EXCLUDE_FROM_ALL ${file})
+    add_dependencies(tests ${test_name})
+
+    # add Boost.Parameter and any libraries that are only needed by the tests
+    # (none at the moment)
     target_link_libraries(${test_name} Boost::parameter)
 
     add_test(NAME ${test_name} COMMAND ${test_name})
 
-endforeach()
+endforeach()