From b16ad173400c27a1208b0925132bbf71014a83f8 Mon Sep 17 00:00:00 2001 From: Dom Rodriguez Date: Sat, 30 May 2020 22:33:08 +0100 Subject: [PATCH] Fix CI infrastructure (.bat/.sh) to initialise Git submodules before build --- clean_build.bat | 2 ++ clean_build.sh | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/clean_build.bat b/clean_build.bat index 8f9fa8b9..4416a7e9 100644 --- a/clean_build.bat +++ b/clean_build.bat @@ -33,6 +33,8 @@ set B_QT_FULLPATH=%B_QT_ROOT%\%B_QT_VER%\%B_QT_MSVC% echo Bonjour: %BONJOUR_SDK_HOME% echo Qt: %B_QT_FULLPATH% +git submodule update --init --recursive + rmdir /q /s build mkdir build if ERRORLEVEL 1 goto failed diff --git a/clean_build.sh b/clean_build.sh index fc1065a5..3a92d8b9 100755 --- a/clean_build.sh +++ b/clean_build.sh @@ -18,6 +18,10 @@ if [ "$(uname)" = "Darwin" ]; then fi # allow local customizations to build environment [ -r ./build_env.sh ] && . ./build_env.sh + +# Initialise Git submodules +git submodule update --init --recursive + B_CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=$B_BUILD_TYPE $B_CMAKE_FLAGS" rm -rf build mkdir build || exit 1