From 129012172258a08efa87cbab927cdd3e4da7db90 Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Sat, 29 Apr 2023 01:48:36 +0200 Subject: [PATCH] build: add CMakePresets for deps build to reduce verbosity --- .cirrus.yml | 8 ++------ cmake.deps/CMakePresets.json | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 cmake.deps/CMakePresets.json diff --git a/.cirrus.yml b/.cirrus.yml index 92507f6d50..d9067b05e3 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -27,15 +27,11 @@ freebsd_task: oldtest_script: - sudo -u cirrus gmake oldtest -with_external_deps_task: +external_deps_task: container: dockerfile: ci/Dockerfile.external_deps deps_script: - # Ideally all dependencies should external for this job, but some - # dependencies don't have the required version available. We use the - # bundled versions for these with the hopes of being able to remove them - # later on. - - cmake -S cmake.deps -B .deps -G Ninja -D USE_BUNDLED=OFF -D USE_BUNDLED_LIBVTERM=ON -D USE_BUNDLED_TS=ON + - cmake -S cmake.deps --preset external_deps - cmake --build .deps build_script: - cmake --preset ci diff --git a/cmake.deps/CMakePresets.json b/cmake.deps/CMakePresets.json new file mode 100644 index 0000000000..f399dad217 --- /dev/null +++ b/cmake.deps/CMakePresets.json @@ -0,0 +1,25 @@ +{ + "version": 3, + "configurePresets": [ + { + "name": "base", + "generator": "Ninja", + "binaryDir": "${sourceDir}/../.deps", + "hidden": true + }, + { + "name": "ci", + "inherits": ["base"] + }, + { + "name": "external_deps", + "description": "Build neovim with external deps on ubuntu", + "cacheVariables": { + "USE_BUNDLED":"OFF", + "USE_BUNDLED_LIBVTERM":"ON", + "USE_BUNDLED_TS":"ON" + }, + "inherits": ["base"] + } + ] +}