widelands

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

  1. fix-wl_include_system_directories
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 9052
Proposed branch: lp:~widelands-dev/widelands/fix-wl_include_system_directories
Merge into: lp:widelands
Diff against target: 47 lines (+5/-3)
3 files modified
appveyor.yml (+2/-0)
cmake/WlFunctions.cmake (+1/-1)
utils/win32/innosetup/Widelands.iss (+2/-2)
To merge this branch: bzr merge lp:~widelands-dev/widelands/fix-wl_include_system_directories
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+366266@code.launchpad.net

Commit message

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

Description of the change

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

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

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.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Appveyor is going green now.

@bunnybot merge

Revision history for this message
bunnybot (widelandsofficial) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
23 # Installed required libs23 # Installed required libs
24 - 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\""24 - 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\""
25 - 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\")"25 - 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\")"
26 # CMake can't find Boost 1.70 yet, so we have to downgrade
27 - 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\""
2628
27shallow_clone: true29shallow_clone: true
2830
2931
=== 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 @@
40# it works is different. SYSTEM includes silence warnings for included headers etc.40# it works is different. SYSTEM includes silence warnings for included headers etc.
41function(wl_include_system_directories TARGET DIR)41function(wl_include_system_directories TARGET DIR)
42 _include_directories_internal(${TARGET} ${DIR} TRUE)42 _include_directories_internal(${TARGET} ${DIR} TRUE)
43endfunction(wl_include_system_directories TARGET_DIR)43endfunction(wl_include_system_directories TARGET DIR)
4444
45# Add common compile tasks, like includes and libraries to link against for third party45# Add common compile tasks, like includes and libraries to link against for third party
46# libraries, and codecheck hook for sources.46# libraries, and codecheck hook for sources.
4747
=== 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 @@
106Source: {#DLLFolder}\libtermcap-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"106Source: {#DLLFolder}\libtermcap-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
107Source: {#DLLFolder}\libgmodule-2.0-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"107Source: {#DLLFolder}\libgmodule-2.0-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
108Source: {#DLLFolder}\libreadline8.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"108Source: {#DLLFolder}\libreadline8.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
109Source: {#DLLFolder}\libicuuc62.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"109Source: {#DLLFolder}\libicuuc64.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
110Source: {#DLLFolder}\libbz2-1.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"110Source: {#DLLFolder}\libbz2-1.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
111Source: {#DLLFolder}\libfreetype-6.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"111Source: {#DLLFolder}\libfreetype-6.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
112#if GetEnv("PLATFORM") == "x64"112#if GetEnv("PLATFORM") == "x64"
@@ -118,7 +118,7 @@
118#endif118#endif
119Source: {#DLLFolder}\libglib-2.0-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"119Source: {#DLLFolder}\libglib-2.0-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
120Source: {#DLLFolder}\libharfbuzz-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"120Source: {#DLLFolder}\libharfbuzz-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
121Source: {#DLLFolder}\libicudt62.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"121Source: {#DLLFolder}\libicudt64.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
122Source: {#DLLFolder}\libjpeg-8.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"122Source: {#DLLFolder}\libjpeg-8.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
123Source: {#DLLFolder}\liblzma-5.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"123Source: {#DLLFolder}\liblzma-5.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
124Source: {#DLLFolder}\libogg-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"124Source: {#DLLFolder}\libogg-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"

Subscribers

People subscribed via source and target branches

to status/vote changes: