From 81863d9b37de0a61a513a10023cf80b33f29781b Mon Sep 17 00:00:00 2001 From: Ricardo Abreu Date: Tue, 30 Apr 2019 23:13:56 +0100 Subject: [PATCH 1/4] Bring up to date to match Catch renaming as catch2 --- CMakeLists.txt | 2 +- catch_tests.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e4058c..260ad20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,7 +113,7 @@ function(add_catch_tests_batch exe_ret src cxx17 require_noexcept) derive_common_test_strings(tst exe ftr # out params "catch_batch" TRUE ${cxx17} ${require_noexcept}) # in params add_test_exe(${exe} ${src} ${ftr} ${require_noexcept}) - target_link_libraries(${exe} PRIVATE Catch2::Catch) + target_link_libraries(${exe} PRIVATE Catch2::Catch2) add_test(NAME ${tst} COMMAND ${exe} "--order" "lex") diff --git a/catch_tests.cpp b/catch_tests.cpp index a8cdc5d..85f9d41 100644 --- a/catch_tests.cpp +++ b/catch_tests.cpp @@ -6,7 +6,7 @@ #include "scope_guard.hpp" #define CATCH_CONFIG_MAIN // This tells Catch to provide a main() -#include "catch/catch.hpp" +#include "catch2/catch.hpp" #include #include From f62159f8342f6e8d46b0563b127df0a9926ec4ac Mon Sep 17 00:00:00 2001 From: Ricardo Abreu Date: Wed, 1 May 2019 01:38:34 +0100 Subject: [PATCH 2/4] Fix osx_image key in travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3f3509c..3ab2518 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,7 +77,7 @@ matrix: - os: osx compiler: gcc - os: osx - os_image: xcode9.3 + osx_image: xcode9.3 compiler: gcc env: >- # preamble works around #8826 (https://is.gd/Ajub8r) MATRIX_EVAL="brew cask uninstall oclint From 63d4ba253347cd02af844476dcebcacc95452dd1 Mon Sep 17 00:00:00 2001 From: Ricardo Abreu Date: Wed, 1 May 2019 01:51:58 +0100 Subject: [PATCH 3/4] Remove workaround for travis bug The bug is now fixed and the workaround was breaking the build. --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3ab2518..15f2222 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,9 +79,6 @@ matrix: - os: osx osx_image: xcode9.3 compiler: gcc - env: >- # preamble works around #8826 (https://is.gd/Ajub8r) - MATRIX_EVAL="brew cask uninstall oclint - && brew install gcc && CC=gcc-7 && CXX=g++-7" before_install: - eval "${MATRIX_EVAL}" # determine overriding compiler, if set From d2878b749ee39b8400e1199f861c0859d6e1da58 Mon Sep 17 00:00:00 2001 From: Ricardo Abreu Date: Wed, 1 May 2019 01:53:27 +0100 Subject: [PATCH 4/4] Move to xcode10.2 in macos builds Avoids compiler bug with xcode9. --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 15f2222..67b4a11 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,11 +73,10 @@ matrix: - g++-7 env: MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0" - os: osx + osx_image: xcode10.2 compiler: clang - os: osx - compiler: gcc - - os: osx - osx_image: xcode9.3 + osx_image: xcode10.2 compiler: gcc before_install: