From add8d5370aa5c98c76955aa6ef46c5078b9ac1e4 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Fri, 18 Oct 2024 10:40:50 +0100 Subject: [PATCH] ci: Remove CMake presets --- .github/workflows/ci.yml | 16 ++- .github/workflows/sonarcloud-analysis.yml | 7 +- .github/workflows/valgrind-analysis.yml | 2 +- BUILD.md | 2 +- CMakePresets.json | 135 ---------------------- README.md | 2 +- 6 files changed, 22 insertions(+), 142 deletions(-) delete mode 100644 CMakePresets.json diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a8ec5f5d..4c1cff648 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -166,7 +166,11 @@ jobs: github-binarycache: true - name: Configure - run: cmake ${{ steps.vcpkg.outputs.vcpkg-cmake-config }} -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_COMPILE_WARNING_AS_ERROR=ON + run: | + cmake ${{ steps.vcpkg.outputs.vcpkg-cmake-config }} ` + -B build -G Ninja ` + -DCMAKE_BUILD_TYPE=Release ` + -DCMAKE_COMPILE_WARNING_AS_ERROR=ON - name: Build run: cmake --build build -j8 @@ -243,7 +247,9 @@ jobs: run: ./scripts/install_deps.py - name: Configure - run: cmake -B build --preset=macos-release -DCMAKE_COMPILE_WARNING_AS_ERROR=ON + run: | + cmake -B build \ + -DCMAKE_COMPILE_WARNING_AS_ERROR=ON - name: Build run: cmake --build build -j8 @@ -335,7 +341,11 @@ jobs: DEBIAN_FRONTEND: noninteractive - name: Configure - run: cmake -B build --preset=linux-release ${{ matrix.distro.extra-cmake-args }} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_COMPILE_WARNING_AS_ERROR=ON + run: | + cmake -B build -G Ninja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \ + ${{ matrix.distro.extra-cmake-args }} - name: Build Package if: ${{ matrix.distro.arch-like != 'true'}} diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index 46fc2a0c6..69dfc4cdc 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -51,7 +51,12 @@ jobs: uses: sonarsource/sonarcloud-github-c-cpp@v3 - name: Configure - run: cmake -B build --preset=linux-debug -DENABLE_COVERAGE=ON + run: | + cmake -B build \ + -G "Ninja" \ + -DCMAKE_BUILD_TYPE="Debug" \ + -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ + -DENABLE_COVERAGE=ON - name: Build run: | diff --git a/.github/workflows/valgrind-analysis.yml b/.github/workflows/valgrind-analysis.yml index 98f8fe677..cc416b49a 100644 --- a/.github/workflows/valgrind-analysis.yml +++ b/.github/workflows/valgrind-analysis.yml @@ -36,7 +36,7 @@ jobs: DEBIAN_FRONTEND: noninteractive - name: Configure - run: cmake -B build --preset=linux-release + run: cmake -B build -G "Ninja" - name: Build run: cmake --build build -j8 diff --git a/BUILD.md b/BUILD.md index f9f923e11..ca3549bc0 100644 --- a/BUILD.md +++ b/BUILD.md @@ -30,7 +30,7 @@ cmake -B build *Windows:* ``` -cmake -B build --preset=windows-release +cmake -B build ``` **3. Build:** diff --git a/CMakePresets.json b/CMakePresets.json deleted file mode 100644 index 09c74b469..000000000 --- a/CMakePresets.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "version": 2, - "configurePresets": [ - { - "name": "base", - "hidden": true, - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" - } - }, - { - "name": "minimal", - "hidden": true, - "environment": { - "DESKFLOW_BUILD_MINIMAL": "ON" - } - }, - { - "name": "windows", - "inherits": "base", - "hidden": true, - "generator": "Ninja", - "cacheVariables": { - "CMAKE_C_COMPILER": "cl.exe", - "CMAKE_CXX_COMPILER": "cl.exe", - "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" - }, - "architecture": { - "value": "x64", - "strategy": "external" - }, - "toolset": { - "value": "host=x64", - "strategy": "external" - } - }, - { - "name": "linux", - "hidden": true, - "inherits": "base", - "generator": "Unix Makefiles" - }, - { - "name": "macos", - "hidden": true, - "inherits": "base", - "generator": "Unix Makefiles" - }, - { - "name": "windows-debug", - "inherits": "windows", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug" - } - }, - { - "name": "windows-release", - "inherits": "windows", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release" - } - }, - { - "name": "linux-debug", - "inherits": "linux", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug" - } - }, - { - "name": "linux-release", - "inherits": "linux", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release" - } - }, - { - "name": "macos-debug", - "inherits": "macos", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug" - } - }, - { - "name": "macos-release", - "inherits": "macos", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release" - } - }, - { - "name": "windows-debug-min", - "inherits": ["windows", "minimal"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug" - } - }, - { - "name": "windows-release-min", - "inherits": ["windows", "minimal"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release" - } - }, - { - "name": "linux-debug-min", - "inherits": ["linux", "minimal"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug" - } - }, - { - "name": "linux-release-min", - "inherits": ["linux", "minimal"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release" - } - }, - { - "name": "macos-debug-min", - "inherits": ["macos", "minimal"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug" - } - }, - { - "name": "macos-release-min", - "inherits": ["macos", "minimal"], - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release" - } - } - ] -} diff --git a/README.md b/README.md index b1b6ad8d3..1126a5428 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ cmake -B build *Windows:* ``` -cmake -B build --preset=windows-release +cmake -B build ``` **3. Build:**