Merge lp:~widelands-dev/widelands/fix-cmakelists-codecheck into lp:widelands

Proposed by GunChleoc
Status: Work in progress
Proposed branch: lp:~widelands-dev/widelands/fix-cmakelists-codecheck
Merge into: lp:widelands
Diff against target: 16 lines (+6/-0)
1 file modified
compile.sh (+6/-0)
To merge this branch: bzr merge lp:~widelands-dev/widelands/fix-cmakelists-codecheck
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+372114@code.launchpad.net

Commit message

Dependency check doesn't work with ninja, so we run it manually from compile.sh

Description of the change

This is a workaround so that everybody can check the dependencies in CMakeLists again locally.

The command is usually run from src/CMakeLists.txt, but ninja ignores it and I don't want to dig into CMake at that level.

Since Travis doesn't have this problem, I didn't bother with failing if this has an error.

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

Continuous integration builds have changed state:

Travis build 5373. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/579215280.
Appveyor build 5143. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_cmakelists_codecheck-5143.

Revision history for this message
Klaus Halfmann (klaus-halfmann) wrote :

Mh, compile runs without any issues.
But how can I detect that utils/build_deps.py was executed?

So I dont know how to approve this.

Revision history for this message
GunChleoc (gunchleoc) wrote :

You can test this by adding a dependency to a library that doesn't use it in one of the CMakeLists.txt files, or by deleting a dependency.

9192. By GunChleoc

Merged trunk.

Unmerged revisions

9192. By GunChleoc

Merged trunk.

9191. By GunChleoc

Dependency check doesn't work with ninja, so we run it manually from compile.sh

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compile.sh'
2--- compile.sh 2019-07-20 13:07:07 +0000
3+++ compile.sh 2019-09-08 20:41:32 +0000
4@@ -352,6 +352,12 @@
5 basic_check
6 set_buildtool
7 prepare_directories_and_links
8+
9+# Dependency check doesn't work with ninja, so we do it manually here
10+if [ $BUILD_TYPE = "Debug" -a \( $buildtool = "ninja" -o $buildtool = "ninja-build" \) ]; then
11+ utils/build_deps.py
12+fi
13+
14 mkdir -p build
15 cd build
16 compile_widelands

Subscribers

People subscribed via source and target branches

to status/vote changes: