From b41b4ef4d739546e34e09e671bb73b5d9a58e783 Mon Sep 17 00:00:00 2001 From: tsjost Date: Thu, 14 Oct 2021 16:13:20 +0200 Subject: [PATCH 1/3] Fix "ar: -no_warning_for_no_symbols: No such file or directory" --- cmake_configure.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake_configure.cmake b/cmake_configure.cmake index 08f5d87a8..8d0db9d4f 100644 --- a/cmake_configure.cmake +++ b/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 From ba400a8e4240733bb6f348559831045c628bd8ee Mon Sep 17 00:00:00 2001 From: tsjost Date: Thu, 14 Oct 2021 01:24:04 +0200 Subject: [PATCH 2/3] Speed up Mac CI build --- .travis.yml | 40 +++++++++++++++++++++++++++------------- README.md | 2 +- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1bf38438..e92448350 100644 --- a/.travis.yml +++ b/.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 diff --git a/README.md b/README.md index c4a60ca6b..42eb7e7c4 100644 --- a/README.md +++ b/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 From 5630af258b8b213a39f5c7a570a96857259e0a7d Mon Sep 17 00:00:00 2001 From: tsjost Date: Thu, 14 Oct 2021 16:46:10 +0200 Subject: [PATCH 3/3] Disable Mac CI building viewer/tools as qt5 cmake files are missing CMake Error at rwviewer/CMakeLists.txt:4 (find_package): By not providing "FindQt5OpenGL.cmake" in CMAKE_MODULE_PATH this project has asked CMake to find a package configuration file provided by "Qt5OpenGL", but CMake did not find one. CMake Error at rwtools/rwfont/CMakeLists.txt:1 (find_package): By not providing "FindQt5.cmake" in CMAKE_MODULE_PATH this project has asked CMake to find a package configuration file provided by "Qt5", but CMake did not find one. --- cmake/ctest/configure_darwin.ctest | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/ctest/configure_darwin.ctest b/cmake/ctest/configure_darwin.ctest index 39b2bb5ed..987fcf589 100644 --- a/cmake/ctest/configure_darwin.ctest +++ b/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 "")