Merge lp:~widelands-dev/widelands/travis-osx-icu into lp:widelands

Proposed by Toni Förster
Status: Merged
Merged at revision: 8943
Proposed branch: lp:~widelands-dev/widelands/travis-osx-icu
Merge into: lp:widelands
Diff against target: 68 lines (+13/-14)
3 files modified
.travis.sh (+4/-3)
CMakeLists.txt (+8/-0)
utils/macos/build_app.sh (+1/-11)
To merge this branch: bzr merge lp:~widelands-dev/widelands/travis-osx-icu
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+360881@code.launchpad.net

Commit message

icu4c cannot be force-linked anymore, use export instead

Description of the change

Travis builds for macOS are breaking since ICU cannot be found anymore:

+brew link --force icu4c

[33mWarning:[0m Refusing to link macOS-provided software: icu4c

To post a comment you must log in.
Revision history for this message
kaputtnik (franku) wrote :

Thanks for taking care of this :-)

8943. By Toni Förster

also export include and lib dirs

8944. By Toni Förster

set CMP0074 to NEW, remove icu4c and gettext from brew install since they are already installed

8945. By Toni Förster

added missing space

8946. By Toni Förster

fix typo

Revision history for this message
Toni Förster (stonerl) wrote :

@kaputtnik you're welcome. :-)

8947. By Toni Förster

ZLIB_ROOT needs to be exported, otherwise it uses the one provided by the system

Revision history for this message
Toni Förster (stonerl) wrote :

macOS-builds on Travis are working again:

https://travis-ci.org/widelands/widelands/jobs/467736784

I just wait for the zlib changes to be tested, should pose no problems, though. We the need to force merge this, since debug and windows builds are failing all over the place.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4334. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/467765266.
Appveyor build 4129. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_travis_osx_icu-4129.

8948. By Toni Förster

remove zlib from brew, since the system provides it

Revision history for this message
Toni Förster (stonerl) wrote :

Okay it does work:

https://travis-ci.org/widelands/widelands/jobs/467818365

@bunnybot merge force

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.travis.sh'
2--- .travis.sh 2018-09-24 10:19:41 +0000
3+++ .travis.sh 2018-12-14 01:38:16 +0000
4@@ -15,11 +15,12 @@
5
6 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
7 # Install osx dependencies
8- # boost and cmake are preinstalled :)
9- brew install gettext glew icu4c sdl2 sdl2_image sdl2_mixer sdl2_ttf zlib
10+ # boost, cmake, gettext and icu4c are preinstalled :)
11+ brew install glew sdl2 sdl2_image sdl2_mixer sdl2_ttf
12 # brew doesn't add a link by default
13 brew link --force gettext
14- brew link --force icu4c
15+ # icu4c cannot be forced
16+ export ICU_ROOT="$(brew --prefix icu4c)"
17 fi
18
19 # Configure the build
20
21=== modified file 'CMakeLists.txt'
22--- CMakeLists.txt 2018-12-13 14:52:43 +0000
23+++ CMakeLists.txt 2018-12-14 01:38:16 +0000
24@@ -33,6 +33,14 @@
25 endif()
26 endif(POLICY CMP0072)
27
28+# This policy is not known to versions prior 3.12 and would result in errors,
29+# if set on such systems. This can be removed when cmake_minimum_required is set
30+# to 3.12 or newer by using:
31+# cmake_policy(VERSION 3.12)
32+if(POLICY CMP0074)
33+ cmake_policy(SET CMP0074 NEW)
34+endif(POLICY CMP0074)
35+
36 include("${CMAKE_SOURCE_DIR}/cmake/WlFunctions.cmake")
37
38 option(OPTION_USE_GLBINDING "Use glbinding instead of GLEW" OFF)
39
40=== modified file 'utils/macos/build_app.sh'
41--- utils/macos/build_app.sh 2018-10-06 19:26:49 +0000
42+++ utils/macos/build_app.sh 2018-12-14 01:38:16 +0000
43@@ -58,9 +58,6 @@
44 exit 1
45 fi
46
47-# We asume CMake 3.x is used and check for the minor version
48-CMAKE_VERSION=$(cmake --version | grep -Eo '3.*' | cut -d . -f 2)
49-
50 # Check if the SDK for the minimum build target is available.
51 # If not, use the one for the installed macOS Version
52 OSX_MIN_VERSION="10.7"
53@@ -185,14 +182,7 @@
54 export SDL2MIXERDIR="$(brew --prefix sdl2_mixer)"
55 export SDL2TTFDIR="$(brew --prefix sdl2_ttf)"
56 export BOOST_ROOT="$(brew --prefix boost)"
57-
58- # Not needed for CMake 3.12 or above, see cmake --help-policy CMP0074.
59- # However Mac OS X nighlies cannot upgrade to a newer cmake version than
60- # 3.9.4 since nothing newer compiles on Mac OS X 10.7 which is used to build
61- # the nightlies.
62- if [ "$CMAKE_VERSION" -lt "12" ]; then
63- export ICU_ROOT="$(brew --prefix icu4c)"
64- fi
65+ export ICU_ROOT="$(brew --prefix icu4c)"
66
67 cmake $SOURCE_DIR -G Ninja \
68 -DCMAKE_C_COMPILER:FILEPATH="$C_COMPILER" \

Subscribers

People subscribed via source and target branches

to status/vote changes: