Merge pull request #127 from poacpm/matken11235-patch-1

Update some CI configs

.travis.yml

@@ -15,13 +15,19 @@ matrix:
     # macOS High Sierra
     - os: osx
       osx_image: xcode10.1
+    # macOS Mojave
+    - os: osx
+      osx_image: xcode10.2
 
 before_install:
   - brew update
-  - brew unlink boost
-  - brew install --ignore-dependencies boost
 install:
-  - brew install llvm yaml-cpp
+  - if [[ "$TRAVIS_OSX_IMAGE" != "xcode10.2" ]]; then
+      brew unlink boost;
+      brew install --ignore-dependencies boost;
+      brew install llvm@7;
+    fi
+  - brew install yaml-cpp
 script:
   - mkdir build
   - cd build

CMakeLists.txt

@@ -53,10 +53,10 @@ if(APPLE)
             OUTPUT_VARIABLE OSX_VERSION
     )
     if(NOT ${OSX_VERSION} EQUAL 14)
-        message(STATUS "Set to homebrew's llvm")
-        set(CMAKE_CXX_COMPILER "/usr/local/opt/llvm/bin/clang++")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/local/opt/llvm/include")
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/local/opt/llvm/lib")
+        message(STATUS "Set homebrew's llvm")
+        set(CMAKE_CXX_COMPILER "/usr/local/opt/llvm@7/bin/clang++")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/local/opt/llvm@7/include")
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L/usr/local/opt/llvm@7/lib")
     endif()
 else()
     if(WIN32 AND MSVC)

appveyor.yml

@@ -4,9 +4,6 @@ branches:
   except:
     - gh-pages
 
-image:
-  - Visual Studio 2017
-
 cache:
   - C:\Libraries\yaml-cpp -> appveyor.yml
   - C:\Libraries\boost-1.69.0 -> appveyor.yml
@@ -21,7 +18,8 @@ platform:
 
 environment:
   matrix:
-    - COMPILER: msvc
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      COMPILER: msvc
       GENERATOR: Visual Studio 15 2017
 #    - COMPILER: mingw-w64
 #      GENERATOR: MinGW Makefiles