ci: Remove CMake presets

This commit is contained in:
Nick Bolton
2024-10-18 10:40:50 +01:00
parent 33b14ccc5c
commit add8d5370a
6 changed files with 22 additions and 142 deletions

View File

@ -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'}}

View File

@ -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: |

View File

@ -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

View File

@ -30,7 +30,7 @@ cmake -B build
*Windows:*
```
cmake -B build --preset=windows-release
cmake -B build
```
**3. Build:**

View File

@ -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"
}
}
]
}

View File

@ -90,7 +90,7 @@ cmake -B build
*Windows:*
```
cmake -B build --preset=windows-release
cmake -B build
```
**3. Build:**