Merge lp:~widelands-dev/widelands/cmake_errors_WL_VERSION into lp:widelands

Proposed by Toni Förster
Status: Merged
Merged at revision: 8858
Proposed branch: lp:~widelands-dev/widelands/cmake_errors_WL_VERSION
Merge into: lp:widelands
Diff against target: 10 lines (+1/-0)
1 file modified
CMakeLists.txt (+1/-0)
To merge this branch: bzr merge lp:~widelands-dev/widelands/cmake_errors_WL_VERSION
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+355728@code.launchpad.net

Commit message

explicitly set CMP0054 to fix warning

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

Continuous integration builds have changed state:

Travis build 4053. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/433707130.
Appveyor build 3849. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_cmake_errors_WL_VERSION-3849.

Revision history for this message
Tino (tino79) wrote :

I am not a big fan of silencing warnings and do not see this warning on both Appveyor and Travis or my system (cmake 3.11.1).

Revision history for this message
GunChleoc (gunchleoc) wrote :

LGTM :)

@bunnbot merge

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

@Tino I get this warning with Cmake 3.12 on macOS.

We're not silencing the warning. We just tell Cmake explicitly to use the new behavior.

Revision history for this message
GunChleoc (gunchleoc) wrote :

@bunnbot merge

Revision history for this message
GunChleoc (gunchleoc) wrote :

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2018-09-26 08:47:26 +0000
+++ CMakeLists.txt 2018-09-26 18:57:06 +0000
@@ -1,6 +1,7 @@
1project (widelands)1project (widelands)
22
3cmake_minimum_required (VERSION 2.8.7)3cmake_minimum_required (VERSION 2.8.7)
4cmake_policy(SET CMP0054 NEW)
45
5include("${CMAKE_SOURCE_DIR}/cmake/WlFunctions.cmake")6include("${CMAKE_SOURCE_DIR}/cmake/WlFunctions.cmake")
67

Subscribers

People subscribed via source and target branches

to status/vote changes: