GunChleoc has proposed merging lp:~widelands-dev/widelands/fix-cmakelists-codecheck into lp:widelands.
Commit message: Dependency check doesn't work with ninja, so we run it manually from compile.sh Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix-cmakelists-codecheck/+merge/372114 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. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix-cmakelists-codecheck into lp:widelands.
=== modified file 'compile.sh' --- compile.sh 2019-07-20 13:07:07 +0000 +++ compile.sh 2019-08-31 16:37:03 +0000 @@ -352,6 +352,12 @@ basic_check set_buildtool prepare_directories_and_links + +# Dependency check doesn't work with ninja, so we do it manually here +if [ $BUILD_TYPE = "Debug" -a \( $buildtool = "ninja" -o $buildtool = "ninja-build" \) ]; then + utils/build_deps.py +fi + mkdir -p build cd build compile_widelands
_______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
