Merge lp:~widelands-dev/widelands/fix-wl_include_system_directories into lp:widelands

[GunChleoc]

Downgrade Boost on AppVeyor, because CMake can't find version 1.70 yet. Upgrade InnoSetup to ICU version 64.

AppVeyor is in a huff again. Let's see if this will fix it.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4731. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/521836139.
Appveyor build 4516. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_wl_include_system_directories-4516.

[GunChleoc (gunchleoc)]

Appveyor is going green now.

@bunnybot merge

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4735. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/522061797.
Appveyor build 4520. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_wl_include_system_directories-4520.

=== modified file 'appveyor.yml'
--- appveyor.yml	2019-02-15 20:04:29 +0000
+++ appveyor.yml	2019-04-19 07:39:14 +0000
@@ -23,6 +23,8 @@
   # Installed required libs
   - cmd: "bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-ninja mingw-w64-%MINGWSUFFIX%-boost mingw-w64-%MINGWSUFFIX%-SDL2_ttf mingw-w64-%MINGWSUFFIX%-SDL2_mixer mingw-w64-%MINGWSUFFIX%-SDL2_image\""
   - cmd: "IF \"%PLATFORM%\" == \"x86\" (bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-glew\") ELSE (bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-glbinding\")"
+  # CMake can't find Boost 1.70 yet, so we have to downgrade
+  - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/%MINGWSUFFIX%/mingw-w64-%MINGWSUFFIX%-boost-1.69.0-2-any.pkg.tar.xz && pacman --noconfirm -U mingw-w64-%MINGWSUFFIX%-boost-1.69.0-2-any.pkg.tar.xz\""
 
 shallow_clone: true
 

=== modified file 'cmake/WlFunctions.cmake'
--- cmake/WlFunctions.cmake	2017-05-14 21:06:23 +0000
+++ cmake/WlFunctions.cmake	2019-04-19 07:39:14 +0000
@@ -40,7 +40,7 @@
 # it works is different. SYSTEM includes silence warnings for included headers etc.
 function(wl_include_system_directories TARGET DIR)
   _include_directories_internal(${TARGET} ${DIR} TRUE)
-endfunction(wl_include_system_directories TARGET_DIR)
+endfunction(wl_include_system_directories TARGET DIR)
 
 # Add common compile tasks, like includes and libraries to link against for third party
 # libraries, and codecheck hook for sources.

=== modified file 'utils/win32/innosetup/Widelands.iss'
--- utils/win32/innosetup/Widelands.iss	2019-03-13 13:48:08 +0000
+++ utils/win32/innosetup/Widelands.iss	2019-04-19 07:39:14 +0000
@@ -106,7 +106,7 @@
 Source: {#DLLFolder}\libtermcap-0.dll;                 DestDir: {app};            Flags: ignoreversion;                                                        Components: "Widelands"
 Source: {#DLLFolder}\libgmodule-2.0-0.dll;                        DestDir: {app};            Flags: ignoreversion;                                             Components: "Widelands"
 Source: {#DLLFolder}\libreadline8.dll;                        DestDir: {app};            Flags: ignoreversion;                                                 Components: "Widelands"
-Source: {#DLLFolder}\libicuuc62.dll;                    DestDir: {app};            Flags: ignoreversion;                                                       Components: "Widelands"
+Source: {#DLLFolder}\libicuuc64.dll;                    DestDir: {app};            Flags: ignoreversion;                                                       Components: "Widelands"
 Source: {#DLLFolder}\libbz2-1.dll;                      DestDir: {app};            Flags: ignoreversion;                                                       Components: "Widelands"
 Source: {#DLLFolder}\libfreetype-6.dll;                 DestDir: {app};            Flags: ignoreversion;                                                       Components: "Widelands"
 #if GetEnv("PLATFORM") == "x64"
@@ -118,7 +118,7 @@
 #endif
 Source: {#DLLFolder}\libglib-2.0-0.dll;                 DestDir: {app};            Flags: ignoreversion;                                                       Components: "Widelands"
 Source: {#DLLFolder}\libharfbuzz-0.dll;                 DestDir: {app};            Flags: ignoreversion;                                                       Components: "Widelands"
-Source: {#DLLFolder}\libicudt62.dll;                    DestDir: {app};            Flags: ignoreversion;                                                       Components: "Widelands"
+Source: {#DLLFolder}\libicudt64.dll;                    DestDir: {app};            Flags: ignoreversion;                                                       Components: "Widelands"
 Source: {#DLLFolder}\libjpeg-8.dll;                     DestDir: {app};            Flags: ignoreversion;                                                       Components: "Widelands"
 Source: {#DLLFolder}\liblzma-5.dll;                     DestDir: {app};            Flags: ignoreversion;                                                       Components: "Widelands"
 Source: {#DLLFolder}\libogg-0.dll;                      DestDir: {app};            Flags: ignoreversion;                                                       Components: "Widelands"