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

[Toni Förster]

icu4c cannot be force-linked anymore, use export instead

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

[kaputtnik (franku)]

Thanks for taking care of this :-)

[Toni Förster (stonerl)]

@kaputtnik you're welcome. :-)

[Toni Förster (stonerl)]

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.

[bunnybot (widelandsofficial)]

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.

[Toni Förster (stonerl)]

Okay it does work:

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

@bunnybot merge force

=== modified file '.travis.sh'
--- .travis.sh	2018-09-24 10:19:41 +0000
+++ .travis.sh	2018-12-14 01:38:16 +0000
@@ -15,11 +15,12 @@
 
 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
   # Install osx dependencies
-  # boost and cmake are preinstalled :)
-  brew install gettext glew icu4c sdl2 sdl2_image sdl2_mixer sdl2_ttf zlib
+  # boost, cmake, gettext and icu4c are preinstalled :)
+  brew install glew sdl2 sdl2_image sdl2_mixer sdl2_ttf
   # brew doesn't add a link by default
   brew link --force gettext
-  brew link --force icu4c
+  # icu4c cannot be forced
+  export ICU_ROOT="$(brew --prefix icu4c)"
 fi
 
 # Configure the build

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2018-12-13 14:52:43 +0000
+++ CMakeLists.txt	2018-12-14 01:38:16 +0000
@@ -33,6 +33,14 @@
   endif()
 endif(POLICY CMP0072)
 
+# This policy is not known to versions prior 3.12 and would result in errors,
+# if set on such systems. This can be removed when cmake_minimum_required is set
+# to 3.12 or newer  by using:
+# cmake_policy(VERSION 3.12)
+if(POLICY CMP0074)
+  cmake_policy(SET CMP0074 NEW)
+endif(POLICY CMP0074)
+
 include("${CMAKE_SOURCE_DIR}/cmake/WlFunctions.cmake")
 
 option(OPTION_USE_GLBINDING "Use glbinding instead of GLEW" OFF)

=== modified file 'utils/macos/build_app.sh'
--- utils/macos/build_app.sh	2018-10-06 19:26:49 +0000
+++ utils/macos/build_app.sh	2018-12-14 01:38:16 +0000
@@ -58,9 +58,6 @@
    exit 1
 fi
 
-# We asume CMake 3.x is used and check for the minor version
-CMAKE_VERSION=$(cmake --version | grep -Eo '3.*' | cut -d . -f 2)
-
 # Check if the SDK for the minimum build target is available.
 # If not, use the one for the installed macOS Version
 OSX_MIN_VERSION="10.7"
@@ -185,14 +182,7 @@
    export SDL2MIXERDIR="$(brew --prefix sdl2_mixer)"
    export SDL2TTFDIR="$(brew --prefix sdl2_ttf)"
    export BOOST_ROOT="$(brew --prefix boost)"
-   
-   # Not needed for CMake 3.12 or above, see cmake --help-policy CMP0074.
-   # However Mac OS X nighlies cannot upgrade to a newer cmake version than
-   # 3.9.4 since nothing newer compiles on Mac OS X 10.7 which is used to build
-   # the nightlies.
-   if [ "$CMAKE_VERSION" -lt "12" ]; then
-      export ICU_ROOT="$(brew --prefix icu4c)"
-   fi
+   export ICU_ROOT="$(brew --prefix icu4c)"
 
    cmake $SOURCE_DIR -G Ninja \
       -DCMAKE_C_COMPILER:FILEPATH="$C_COMPILER" \