Merge fix Mac non-xcode and CI building

.travis.yml

@@ -25,19 +25,33 @@ matrix:
   #   env: NAME="conan" NAME_SUFFIX="conan" USE_CONAN=1
   #   script:
   #     - scripts/docker/docker_travis.sh "conan_base.docker"
-  # - os: osx
-  #   compiler: clang
-  #   env: NAME="Apple macOS" NAME_SUFFIX="mac"
-  #   osx_image: xcode11
-  #   install:
-  #     - brew update
-  #     - /usr/bin/yes | pip2 uninstall numpy  # see https://github.com/travis-ci/travis-ci/issues/6688
-  #     - brew upgrade
-  #     - brew install boost cmake bullet ffmpeg glm openal-soft qt5 sdl2 jack freetype
-  #     - export PATH="/usr/local/opt/qt/bin:$PATH"
-  #   script:
-  #     - mkdir -p "$TRAVIS_BUILD_DIR/build"
-  #     - ctest -VV -S "$TRAVIS_BUILD_DIR/cmake/ctest/script_ci.ctest"
+  - os: osx
+    compiler: clang
+    env: NAME="Apple macOS" NAME_SUFFIX="mac"
+    osx_image: xcode12.5
+    cache:
+      directories:
+        - $HOME/Library/Caches/Homebrew
+    before_cache:
+      - brew cleanup
+    addons:
+      homebrew:
+        packages:
+          - boost
+          - cmake
+          - bullet
+          - ffmpeg
+          - glm
+          - openal-soft
+          - qt5
+          - sdl2
+          - jack
+          - freetype
+    install:
+      - export PATH="/usr/local/opt/qt/bin:$PATH"
+    script:
+      - mkdir -p "$TRAVIS_BUILD_DIR/build"
+      - ctest -VV -S "$TRAVIS_BUILD_DIR/cmake/ctest/script_ci.ctest"
 
 notifications:
     email: false

README.md

@@ -12,7 +12,7 @@ this it will not be possible to play.
 
 Windows | Linux | macOS | coverage
 ---| --- | ---  | ---
-[![Build status](https://ci.appveyor.com/api/projects/status/k33qf9ssrja6ckx8/branch/master?svg=true)](https://ci.appveyor.com/project/rwengine/openrw/branch/master) | [![Build Status](https://app.travis-ci.com/rwengine/openrw.svg?branch=master)](https://app.travis-ci.com/rwengine/openrw) | [disabled](https://github.com/rwengine/openrw/commit/f8483d190588a159f65c1c3ffb153e20888347b8) | [![codecov](https://codecov.io/gh/rwengine/openrw/branch/master/graph/badge.svg)](https://codecov.io/gh/rwengine/openrw)
+[![Build status](https://ci.appveyor.com/api/projects/status/k33qf9ssrja6ckx8/branch/master?svg=true)](https://ci.appveyor.com/project/rwengine/openrw/branch/master) | [![Build Status](https://app.travis-ci.com/rwengine/openrw.svg?branch=master)](https://app.travis-ci.com/rwengine/openrw) | [![Build Status](https://app.travis-ci.com/rwengine/openrw.svg?branch=master)](https://app.travis-ci.com/rwengine/openrw) | [![codecov](https://codecov.io/gh/rwengine/openrw/branch/master/graph/badge.svg)](https://codecov.io/gh/rwengine/openrw)
 
 
 ## Links

cmake/ctest/configure_darwin.ctest

@@ -6,8 +6,8 @@ else()
 endif()
 set(CONFIGURE_EXTRA_OPTIONS ";")
 set(BUILD_EXTRA_FLAGS "")
-set(BUILD_TOOLS TRUE)
-set(BUILD_VIEWER TRUE)
+set(BUILD_TOOLS FALSE)
+set(BUILD_VIEWER FALSE)
 set(CHECK_IWYU FALSE)
 set(ENABLE_SANITIZERS "")
 

cmake_configure.cmake

@@ -213,7 +213,7 @@ function(openrw_target_apply_options)
         endif()
     endif()
 
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_GENERATOR STREQUAL Xcode)
         set_property(
             TARGET "${ORW_TARGET}"
             APPEND