summaryrefslogtreecommitdiff
path: root/Meta
diff options
context:
space:
mode:
authorAndrew Kaster <akaster@serenityos.org>2021-09-16 03:02:44 -0600
committerBrian Gianforcaro <b.gianfo@gmail.com>2021-09-16 15:47:13 +0000
commitd0506730b84fbffe3d2221247a979f120d942965 (patch)
tree2c681db68735c5c5eecd6d7ef20d35983df1b99b /Meta
parent454a839f4982f6ef48968de86ea1511c895df815 (diff)
downloadserenity-d0506730b84fbffe3d2221247a979f120d942965.zip
Meta: Ensure BUILD_LAGOM is set when running `serenity.sh test lagom`
If the superbuild created the lagom binary directory, it won't set BUILD_LAGOM=ON in the CMake cache for that binary directory. Insert a check into build_target() to make sure that if the user explicitly asks for the lagom target, we have all our ducks in a row.
Diffstat (limited to 'Meta')
-rwxr-xr-xMeta/serenity.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/Meta/serenity.sh b/Meta/serenity.sh
index 9df0e94f51..49307f5889 100755
--- a/Meta/serenity.sh
+++ b/Meta/serenity.sh
@@ -199,6 +199,11 @@ run_tests() {
}
build_target() {
+ if [ "$TARGET" = "lagom" ]; then
+ # Ensure that all lagom binaries get built, in case user first
+ # invoked superbuild for serenity target that doesn't set -DBUILD_LAGOM=ON
+ cmake -S "$SERENITY_SOURCE_DIR/Meta/Lagom" -B "$BUILD_DIR" -DBUILD_LAGOM=ON
+ fi
# With zero args, we are doing a standard "build"
# With multiple args, we are doing an install/image/run
if [ $# -eq 0 ]; then