Skip to content

Commit 33772d8

Browse files
committed
Standardize on Ninja Multi-Config and conan-default preset
1 parent 48c3781 commit 33772d8

6 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/actions/setup-conan/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ inputs:
2222
default: "20"
2323
generator:
2424
description: 'CMake generator'
25-
default: "Ninja"
25+
default: "Ninja Multi-Config"
2626

2727
runs:
2828
using: "composite"

.github/workflows/clang-tidy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
if [ -f build/generators/conanbuild.sh ]; then
7777
source build/generators/conanbuild.sh
7878
fi
79-
cmake --preset ${{ env.CONAN_PRESET }} -DCLANG_TIDY_ENABLE=1
79+
cmake --preset conan-default -DCLANG_TIDY_ENABLE=1
8080
8181
- name: Build
8282
shell: bash

.github/workflows/cmake.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ jobs:
247247
shell: cmd
248248
run: |
249249
if exist build\generators\conanbuild.bat call build\generators\conanbuild.bat
250-
cmake --preset ${{ env.CONAN_PRESET }} -DENABLE_ADDRESS_SANITIZER=ON -DENABLE_UNDEFINED_BEHAVIOUR_SANITIZER=ON
250+
cmake --preset conan-default -DENABLE_ADDRESS_SANITIZER=ON -DENABLE_UNDEFINED_BEHAVIOUR_SANITIZER=ON
251251
252252
- name: Configure CMake (Linux/macOS)
253253
if: runner.os != 'Windows'
@@ -256,7 +256,7 @@ jobs:
256256
if [ -f build/generators/conanbuild.sh ]; then
257257
source build/generators/conanbuild.sh
258258
fi
259-
cmake --preset ${{ env.CONAN_PRESET }} -DENABLE_ADDRESS_SANITIZER=ON -DENABLE_UNDEFINED_BEHAVIOUR_SANITIZER=ON
259+
cmake --preset conan-default -DENABLE_ADDRESS_SANITIZER=ON -DENABLE_UNDEFINED_BEHAVIOUR_SANITIZER=ON
260260
261261
- name: Build (Windows)
262262
if: runner.os == 'Windows'

.github/workflows/code_coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
if [ -f build/generators/conanbuild.sh ]; then
8787
source build/generators/conanbuild.sh
8888
fi
89-
cmake --preset ${{ env.CONAN_PRESET }} -DENABLE_CODE_COVERAGE=1
89+
cmake --preset conan-default -DENABLE_CODE_COVERAGE=1
9090
9191
- name: Build
9292
shell: bash

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
if [ -f build/generators/conanbuild.sh ]; then
7979
source build/generators/conanbuild.sh
8080
fi
81-
cmake --preset ${{ env.CONAN_PRESET }} -DMORPHEUS_BUILD_DOCUMENTATION:BOOL=ON
81+
cmake --preset conan-default -DMORPHEUS_BUILD_DOCUMENTATION:BOOL=ON
8282
8383
- name: Build Documentation
8484
shell: bash

.github/workflows/iwyu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
if [ -f build/generators/conanbuild.sh ]; then
8181
source build/generators/conanbuild.sh
8282
fi
83-
cmake --preset ${{ env.CONAN_PRESET }} -DIWYU_ENABLE=1
83+
cmake --preset conan-default -DIWYU_ENABLE=1
8484
8585
- name: Build
8686
shell: bash

0 commit comments

Comments
 (0)