From b0af6048ededc4d9164a8fc4d07a7c52e5c78fc0 Mon Sep 17 00:00:00 2001 From: Zephyron Date: Tue, 16 Sep 2025 16:00:55 +1000 Subject: [PATCH] Enable vcpkg for dependency management to resolve nlohmann_json dependency --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8797ba052..0e93cc05c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,7 +70,7 @@ build-linux: - apt-get install -y -qq libvulkan-dev script: - git submodule update --init --recursive - - cmake -B build -S . -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DENABLE_QT=ON -DENABLE_SDL2=ON -DENABLE_WEB_SERVICE=ON -DCITRON_USE_EXTERNAL_SDL2=ON -DCITRON_USE_BUNDLED_FFMPEG=OFF -DCMAKE_EXPORT_COMPILE_COMMANDS=ON + - cmake -B build -S . -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DENABLE_QT=ON -DENABLE_SDL2=ON -DENABLE_WEB_SERVICE=ON -DCITRON_USE_BUNDLED_VCPKG=ON -DCITRON_USE_BUNDLED_FFMPEG=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON - cmake --build build --config $BUILD_TYPE --parallel $CMAKE_BUILD_PARALLEL_LEVEL - chmod +x AppImage-build-local.sh - ./AppImage-build-local.sh || echo "AppImage build failed, continuing..."