Merge pull request #8 from ricab/back-to-the-future

Back to the future

.travis.yml

@@ -73,15 +73,11 @@ matrix:
             - g++-7
       env: MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0"
     - os: osx
+      osx_image: xcode10.2
       compiler: clang
     - os: osx
+      osx_image: xcode10.2
       compiler: gcc
-    - os: osx
-      os_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

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")
 

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 <functional>
 #include <list>