Skip to content

Commit ebd6219

Browse files
authored
need to build libs identical to mulle-objc-runtime
1 parent fcfb205 commit ebd6219

File tree

1 file changed

+35
-18
lines changed

1 file changed

+35
-18
lines changed

.github/workflows/cmake-errors.yml

Lines changed: 35 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,18 @@ jobs:
106106
- name: Configure, build and install mulle-core with CMake
107107
shell: bash
108108
working-directory: "${{steps.set-install-dir.outputs.MULLE_CORE_SRC_DIR}}"
109+
env:
110+
CC: ${{ matrix.compiler }}
111+
CFLAGS: ${{ matrix.cflags }}
109112
run: |
110-
cmake -B build \
113+
cmake ${{ matrix.cmake-args }} \
114+
-B build \
111115
-DMULLE_SDK_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
112116
-DCMAKE_INSTALL_PREFIX="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
113117
-DCMAKE_PREFIX_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
114-
-DCMAKE_BUILD_TYPE=Release
115-
cmake --build build --config Release
116-
cmake --install build --config Release
118+
-DCMAKE_BUILD_TYPE="${{ matrix.build-config || 'Release' }}"
119+
cmake --build build --config "${{ matrix.build-config || 'Release' }}"
120+
cmake --install build --config "${{ matrix.build-config || 'Release' }}"
117121
118122
- name: Clone mulle-atinit repository
119123
run: |
@@ -122,14 +126,18 @@ jobs:
122126
- name: Configure, build and install mulle-atinit with CMake
123127
shell: bash
124128
working-directory: "${{steps.set-install-dir.outputs.MULLE_ATINIT_SRC_DIR}}"
129+
env:
130+
CC: ${{ matrix.compiler }}
131+
CFLAGS: ${{ matrix.cflags }}
125132
run: |
126-
cmake -B build \
127-
-DMULLE_SDK_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
128-
-DCMAKE_INSTALL_PREFIX="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
129-
-DCMAKE_PREFIX_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
130-
-DCMAKE_BUILD_TYPE=Release
131-
cmake --build build --config Release
132-
cmake --install build --config Release
133+
cmake ${{ matrix.cmake-args }} \
134+
-B build \
135+
-DMULLE_SDK_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
136+
-DCMAKE_INSTALL_PREFIX="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
137+
-DCMAKE_PREFIX_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
138+
-DCMAKE_BUILD_TYPE="${{ matrix.build-config || 'Release' }}"
139+
cmake --build build --config "${{ matrix.build-config || 'Release' }}"
140+
cmake --install build --config "${{ matrix.build-config || 'Release' }}"
133141
134142
- name: Clone mulle-atexit repository
135143
run: |
@@ -138,14 +146,23 @@ jobs:
138146
- name: Configure, build and install mulle-atexit with CMake
139147
shell: bash
140148
working-directory: "${{steps.set-install-dir.outputs.MULLE_ATEXIT_SRC_DIR}}"
149+
env:
150+
CC: ${{ matrix.compiler }}
151+
CFLAGS: ${{ matrix.cflags }}
141152
run: |
142-
cmake -B build \
143-
-DMULLE_SDK_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
144-
-DCMAKE_INSTALL_PREFIX="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
145-
-DCMAKE_PREFIX_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
146-
-DCMAKE_BUILD_TYPE=Release
147-
cmake --build build --config Release
148-
cmake --install build --config Release
153+
cmake ${{ matrix.cmake-args }} \
154+
-B build \
155+
-DMULLE_SDK_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
156+
-DCMAKE_INSTALL_PREFIX="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
157+
-DCMAKE_PREFIX_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
158+
-DCMAKE_BUILD_TYPE="${{ matrix.build-config || 'Release' }}"
159+
cmake --build build --config "${{ matrix.build-config || 'Release' }}"
160+
cmake --install build --config "${{ matrix.build-config || 'Release' }}"
161+
162+
- name: Install packages (Windows)
163+
if: runner.os == 'Windows'
164+
run: |
165+
choco install --no-progress ninja ${{ matrix.packages }}
149166
150167
- name: Generate project files
151168
shell: bash

0 commit comments

Comments
 (0)