From fe48da43ac4d234973c8c1c5a84bd9aebbc70216 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@gmail.com>
Date: Sun, 29 Dec 2019 06:42:56 +0200
Subject: [PATCH] Add CMake jobs to Travis

---
 .travis.yml | 45 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 727630103a..246500a900 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,11 +55,13 @@ matrix:
     - env: SCRIPT=ci_boost_status RELEASE=1
 
     # Run 'quick' tests.
-    - env: SCRIPT=ci_boost_status TARGET=quick TOOLSET=gcc CXXSTD=03,11
+    - env: SCRIPT=ci_boost_status TARGET=quick TOOLSET=gcc CXXSTD=03,11 DIST=xenial
+      dist: xenial
       compiler: g++
 
-    - env: SCRIPT=ci_boost_status TARGET=quick TOOLSET=clang CXXSTD=03,11
-      compiler: clang++
+    - env: SCRIPT=ci_boost_status TARGET=quick TOOLSET=gcc CXXSTD=14,17 DIST=bionic
+      dist: bionic
+      compiler: g++
 
     # Build Boost
     - env: SCRIPT=ci_boost_build TOOLSET=gcc CXXSTD=11
@@ -69,6 +71,43 @@ matrix:
     - env: SCRIPT=ci_boost_build TOOLSET=gcc CXXSTD=11 RELEASE=1
       compiler: g++
 
+    # Build Boost with CMake
+    - env: CMAKE_BUILD=1
+      compiler: g++
+
+      before_script: true
+      before_install: true
+      after_success: true
+      after_failure: true
+      after_script: true
+
+      install:
+      - git submodule update --init
+
+      script:
+      - mkdir __build && cd __build
+      - cmake -DBOOST_ENABLE_CMAKE=ON -DBoost_VERBOSE=ON -DBOOST_INSTALL_LAYOUT=tagged -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=OFF ..
+      - cmake --build .
+
+    # Test Boost with CMake
+    - env: CMAKE_TEST=1
+      compiler: g++
+
+      before_script: true
+      before_install: true
+      after_success: true
+      after_failure: true
+      after_script: true
+
+      install:
+      - git submodule update --init
+
+      script:
+      - mkdir __build && cd __build
+      - cmake -DBOOST_ENABLE_CMAKE=ON -DBoost_VERBOSE=ON -DBUILD_TESTING=ON ..
+      - cmake --build .
+      - ctest --output-on-failure -R quick
+
 #    # Run tests for the library updated by this commit.
 #    - env: SCRIPT=ci_boost_test_library TOOLSET=gcc CXXSTD=11
 #      compiler: g++