Skip to content

Commit fdb7ee8

Browse files
committed
ci: fixes for modules
1 parent feb0249 commit fdb7ee8

1 file changed

Lines changed: 18 additions & 1 deletion

File tree

.github/workflows/build_cmake.yml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,15 @@ jobs:
127127
if: matrix.config.name != 'Tarball'
128128
shell: bash
129129
run: |
130+
CMAKE_GENERATOR=${{ matrix.config.generator }}
131+
if [[ "$RUNNER_OS" == "Linux" ]]; then
132+
if [[ "${{ matrix.library_mode }}" == "MODULE" ]]; then
133+
CMAKE_GENERATOR=-GNinja
134+
fi
135+
fi
136+
130137
cmake -S . -B build \
131-
${{ matrix.config.generator }} \
138+
$CMAKE_GENERATOR \
132139
${{ matrix.config.cmakeflags }} \
133140
-DLIBREMIDI_FIND_BOOST=${{ matrix.boost }} \
134141
-DLIBREMIDI_LIBRARY_MODE=${{ matrix.library_mode }} \
@@ -179,8 +186,13 @@ jobs:
179186
whoami
180187
env
181188
freebsd-version
189+
CMAKE_GENERATOR=
190+
if [[ "${{ matrix.library_mode }}" == "MODULE" ]]; then
191+
CMAKE_GENERATOR=-GNinja
192+
fi
182193
183194
cmake -S . -B build \
195+
$CMAKE_GENERATOR \
184196
-DLIBREMIDI_FIND_BOOST=${{ matrix.boost }} \
185197
-DLIBREMIDI_LIBRARY_MODE=${{ matrix.library_mode }} \
186198
-DLIBREMIDI_EXAMPLES=1 \
@@ -239,7 +251,12 @@ jobs:
239251
240252
- name: Configure
241253
run: |
254+
CMAKE_GENERATOR=${{ matrix.config.generator }}
255+
if [[ "${{ matrix.library_mode }}" == "MODULE" ]]; then
256+
CMAKE_GENERATOR=-GNinja
257+
fi
242258
cmake -S . -B build \
259+
$CMAKE_GENERATOR \
243260
-DLIBREMIDI_FIND_BOOST=${{ matrix.boost }} \
244261
-DLIBREMIDI_LIBRARY_MODE=${{ matrix.library_mode }} \
245262
-DLIBREMIDI_EXAMPLES=1 \

0 commit comments

Comments
 (0)