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

Proposed by Tino
Status: Merged
Merged at revision: 8851
Proposed branch: lp:~widelands-dev/widelands/remove_duplicate_code
Merge into: lp:widelands
Diff against target: 21 lines (+0/-11)
1 file modified
CMakeLists.txt (+0/-11)
To merge this branch: bzr merge lp:~widelands-dev/widelands/remove_duplicate_code
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email:

Commit message

Remove duplicate code for revision detection task (code already in BzrRevision.cmake)

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


@bunnybot merge

review: Approve
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4039. State: passed. Details:
Appveyor build 3835. State: success. Details:

Revision history for this message
Tino (tino79) wrote :

OK, the merge was a bit premature:
Revision detection is not broken, but does not happen any longer...

Revision history for this message
GunChleoc (gunchleoc) wrote :

I tested this on Linux and got a correct version detection - maybe it's a Windows issue?

Revision history for this message
Benedikt Straub (nordfriese) wrote :

Um, the compile script no longer works for me on linux in trunk-8854?

-- Not using AddressSanitizer.
-- Version of Widelands Build is (Release)

CMake Warning (dev) at /usr/share/cmake-3.10/Modules/CTest.cmake:234 (if):
  Policy CMP0054 is not set: Only interpret if() arguments as variables or
  keywords when unquoted. Run "cmake --help-policy CMP0054" for policy
  details. Use the cmake_policy command to set the policy and suppress this

  Quoted variables like "" will no longer be dereferenced when the policy is
  set to NEW. Since the policy is not set the OLD behavior will be used.
Call Stack (most recent call first):
  CMakeLists.txt:254 (include)
This warning is for project developers. Use -Wno-dev to suppress it.

-- Configuring done
-- Generating done
-- Build files have been written to: /home/benedikt/widelands-debug/widelands/build
[67/68] Linking CXX executable src/scripting/test/WL_VERSIONtest_scripting
src/third_party/libthird_party_eris.a(loslib.c.o): In Funktion »os_tmpname«:
loslib.c:(.text+0x467): Warnung: the use of `tmpnam' is dangerous, better use `mkstemp'
[68/68] cd /home/benedikt/widelands-debug/widelands/build && /usr/bin/ctest --output-on-failure
Test project /home/benedikt/widelands-debug/widelands/build
    Start 1: test_economy
1/4 Test #1: test_economy ..................... Passed 0.06 sec
    Start 2: test_io_filesystem
2/4 Test #2: test_io_filesystem ............... Passed 0.03 sec
    Start 3: notifications_test
3/4 Test #3: notifications_test ............... Passed 0.01 sec
    Start 4: test_scripting
4/4 Test #4: test_scripting ................... Passed 0.01 sec

100% tests passed, 0 tests failed out of 4

Total Test time (real) = 0.12 sec
mv: Aufruf von stat für 'src/widelands' nicht möglich: Datei oder Verzeichnis nicht gefunden

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

The cmake warning is caused by Tino's "Quickfix" at revision 8853 in trunk.

These lines in BzrRevision.cmake trigger it the policy:

string(REGEX REPLACE "\n|\r$" "" WL_VERSION "${WL_VERSION}")

See here:

adding this line to CMakeLists.txt solved the error:

cmake_policy(SET CMP0054 NEW)

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

The version isn't shown on macOS either:

The "RESULT_VARIABLE" says: No such file or directory

So the command does not seem to be executed and therefore WL_Version is empty.

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

Sorry for the spam. This line needs to be removed:


Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2018-08-21 08:14:38 +0000
3+++ CMakeLists.txt 2018-09-25 07:48:30 +0000
4@@ -246,17 +246,6 @@
5 BzrRevision ALL
7 )
9- # Detect version now
10- execute_process (
15- )
17- configure_file (${CMAKE_CURRENT_SOURCE_DIR}/src/ ${CMAKE_CURRENT_BINARY_DIR}/src/
18- message (STATUS "Version of Widelands Build is ${WL_VERSION}(${CMAKE_BUILD_TYPE})")
20 add_custom_target (
21 InputRevision ALL


People subscribed via source and target branches

to status/vote changes: