Update .github/workflows

.github/workflows/ci.yml

@@ -42,6 +42,7 @@ jobs:
           - toolset: gcc-8
             cxxstd: "03,11,14,17,2a"
             os: ubuntu-18.04
+            install: g++-8
           - toolset: gcc-9
             cxxstd: "03,11,14,17,2a"
             os: ubuntu-18.04
@@ -87,6 +88,7 @@ jobs:
             compiler: clang++-6.0
             cxxstd: "03,11,14,17"
             os: ubuntu-18.04
+            install: clang-6.0
           - toolset: clang
             compiler: clang++-7
             cxxstd: "03,11,14,17"
@@ -96,6 +98,7 @@ jobs:
             compiler: clang++-8
             cxxstd: "03,11,14,17,2a"
             os: ubuntu-20.04
+            install: clang-8
           - toolset: clang
             compiler: clang++-9
             cxxstd: "03,11,14,17,2a"
@@ -104,6 +107,10 @@ jobs:
             compiler: clang++-10
             cxxstd: "03,11,14,17,2a"
             os: ubuntu-20.04
+          - toolset: clang
+            compiler: clang++-11
+            cxxstd: "03,11,14,17,2a"
+            os: ubuntu-20.04
           - toolset: clang
             cxxstd: "03,11,14,17,2a"
             os: macos-10.15

.travis.yml

@@ -124,21 +124,11 @@ matrix:
     - os: linux
       dist: bionic
       compiler: g++-10
-      env: TOOLSET=gcc CXXSTD=03,11,14,17,2a
-      addons:
-        apt:
-          packages:
-            - g++-10
-          sources:
-            - ubuntu-toolchain-r-test
-
-    - os: linux
-      compiler: g++-9
       env: UBSAN=1 TOOLSET=gcc CXXSTD=03,11,14,17,2a UBSAN_OPTIONS=print_stacktrace=1 LINKFLAGS=-fuse-ld=gold
       addons:
         apt:
           packages:
-            - g++-9
+            - g++-10
           sources:
             - ubuntu-toolchain-r-test
 
@@ -263,7 +253,7 @@ matrix:
             - llvm-toolchain-xenial-8
 
     - os: linux
-      dist: xenial
+      dist: bionic
       compiler: clang++-9
       env: TOOLSET=clang CXXSTD=03,11,14,17,2a
       addons:
@@ -272,11 +262,11 @@ matrix:
             - clang-9
           sources:
             - ubuntu-toolchain-r-test
-            - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
+            - sourceline: 'deb https://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main'
               key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
 
     - os: linux
-      dist: xenial
+      dist: bionic
       compiler: clang++-10
       env: TOOLSET=clang CXXSTD=03,11,14,17,2a
       addons:
@@ -285,28 +275,34 @@ matrix:
             - clang-10
           sources:
             - ubuntu-toolchain-r-test
-            - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main'
+            - sourceline: 'deb https://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main'
               key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
 
     - os: linux
-      compiler: clang++-8
+      dist: bionic
+      compiler: clang++-11
+      env: TOOLSET=clang CXXSTD=03,11,14,17,2a
+      addons:
+        apt:
+          packages:
+            - clang-11
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: 'deb https://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main'
+              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
+
+    - os: linux
+      dist: bionic
+      compiler: clang++-12
       env: UBSAN=1 TOOLSET=clang CXXSTD=03,11,14,17,2a UBSAN_OPTIONS=print_stacktrace=1
       addons:
         apt:
           packages:
-            - clang-8
+            - clang-12
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-xenial-8
-
-    - os: linux
-      dist: trusty
-      compiler: clang++-libc++
-      env: TOOLSET=clang CXXSTD=03,11,14,1z
-      addons:
-        apt:
-          packages:
-            - libc++-dev
+            - sourceline: 'deb https://apt.llvm.org/bionic/ llvm-toolchain-bionic-12 main'
+              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
 
     - os: linux
       dist: trusty
@@ -317,14 +313,34 @@ matrix:
           packages:
             - libc++-dev
 
-    - os: osx
-      compiler: clang++
-      env: TOOLSET=clang CXXSTD=03,11,14,1z
+    - os: linux
+      dist: bionic
+      compiler: clang++-libc++
+      env: UBSAN=1 TOOLSET=clang CXXSTD=03,11,14,17,2a UBSAN_OPTIONS=print_stacktrace=1
+      addons:
+        apt:
+          packages:
+            - libc++-dev
 
     - os: osx
       compiler: clang++
       env: UBSAN=1 TOOLSET=clang CXXSTD=03,11,14,1z UBSAN_OPTIONS=print_stacktrace=1
 
+    - os: linux
+      env: CMAKE_TEST=1
+      script:
+        - mkdir __build__ && cd __build__
+        - cmake -DBOOST_ENABLE_CMAKE=1 -DBUILD_TESTING=ON -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES=function ..
+        - ctest --output-on-failure -R boost_function
+
+    - os: linux
+      env: CMAKE_SUBDIR_TEST=1
+      script:
+      - cd libs/function/test/cmake_subdir_test && mkdir __build__ && cd __build__
+      - cmake ..
+      - cmake --build .
+      - cmake --build . --target check
+
 install:
   - BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
   - cd ..

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()
+

test/CMakeLists.txt

@@ -0,0 +1,11 @@
+# Copyright 2018, 2019 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
+
+include(BoostTestJamfile OPTIONAL RESULT_VARIABLE HAVE_BOOST_TEST)
+
+if(HAVE_BOOST_TEST)
+
+boost_test_jamfile(FILE Jamfile.v2 LINK_LIBRARIES Boost::function Boost::core Boost::lambda)
+
+endif()