mirror of
https://github.com/JulianGro/overte.git
synced 2025-04-13 22:27:13 +02:00
Consolidate "Configure CMake" steps.
This commit is contained in:
parent
b26d81b3b8
commit
e6ca34d90e
1 changed files with 8 additions and 9 deletions
17
.github/workflows/pr_build.yml
vendored
17
.github/workflows/pr_build.yml
vendored
|
@ -261,16 +261,15 @@ jobs:
|
|||
path: ~/.conan2/
|
||||
|
||||
- name: Configure CMake
|
||||
if: startsWith(matrix.os, 'Windows') == false
|
||||
shell: bash
|
||||
# This syntax requires CMake 3.23
|
||||
run: cmake --preset conan-${BUILD_TYPE,,} $CMAKE_EXTRA
|
||||
|
||||
- name: Configure CMake (Windows)
|
||||
if: startsWith(matrix.os, 'Windows')
|
||||
shell: bash
|
||||
# This syntax requires CMake 3.23
|
||||
run: cmake --preset conan-default $CMAKE_EXTRA
|
||||
run: |
|
||||
if [[ "${{ matrix.os }}" =~ "Windows"; then
|
||||
# This syntax requires CMake 3.23
|
||||
cmake --preset conan-default $CMAKE_EXTRA # Why does Conan not provide the preset we tell it to on Windows?
|
||||
else
|
||||
# This syntax requires CMake 3.23
|
||||
cmake --preset conan-${BUILD_TYPE,,} $CMAKE_EXTRA
|
||||
fi
|
||||
|
||||
- name: Build Application
|
||||
if: matrix.build_type == 'full' || matrix.build_type == 'client'
|
||||
|
|
Loading…
Reference in a new issue