Skip to content

Commit 8b893a4

Browse files
committed
Merge branch 'master' into release
2 parents dc2b6ac + b8eb02e commit 8b893a4

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/vcpkg_build_master.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,17 +104,17 @@ jobs:
104104
CC: gcc-${{ matrix.gcc }}
105105
CXX: g++-${{ matrix.gcc }}
106106
run: |
107-
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo
107+
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVCPKG_BUILD_TYPE=release
108108
if: matrix.os == 'ubuntu-latest'
109109

110110
- name: Install dependencies and generate project files (mac)
111111
run: |
112-
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo
112+
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVCPKG_BUILD_TYPE=release
113113
if: matrix.os == 'macos-latest'
114114

115115
- name: Install dependencies and generate project files (windows)
116116
run: |
117-
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo
117+
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVCPKG_BUILD_TYPE=release
118118
if: matrix.os == 'windows-latest'
119119

120120
# Build the whole project with Ninja (which is spawn by CMake).

.github/workflows/vcpkg_build_release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,18 +104,18 @@ jobs:
104104
CC: gcc-${{ matrix.gcc }}
105105
CXX: g++-${{ matrix.gcc }}
106106
run: |
107-
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo
107+
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVCPKG_BUILD_TYPE=release
108108
if: matrix.os == 'ubuntu-latest'
109109
- name: Install dependencies and generate project files (mac)
110110
env:
111111
CC: gcc-${{ matrix.gcc }}
112112
CXX: g++-${{ matrix.gcc }}
113113
run: |
114-
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo
114+
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVCPKG_BUILD_TYPE=release
115115
if: matrix.os == 'macos-latest'
116116
- name: Install dependencies and generate project files (windows)
117117
run: |
118-
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo
118+
cmake -S "${{ github.workspace }}" -B "${{ env.CMAKE_BUILD_DIR }}" -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVCPKG_BUILD_TYPE=release
119119
if: matrix.os == 'windows-latest'
120120
# Build the whole project with Ninja (which is spawn by CMake).
121121
- name: Build

0 commit comments

Comments
 (0)