Skip to content

Commit ee27a49

Browse files
authored
fixy tweakies nervi nervi
1 parent 87d3f7d commit ee27a49

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

.github/workflows/cmake-errors.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
if [ "$RUNNER_OS" == "Windows" ]
7979
then
8080
INSTALL_DIR="$GITHUB_WORKSPACE\\usr"
81-
CMAKE_INSTALL_DIR=="$(cygpath -u "$INSTALL_DIR")"
81+
CMAKE_INSTALL_DIR="$(cygpath -u "$INSTALL_DIR")"
8282
SRC_DIR="$GITHUB_WORKSPACE\\tmp"
8383
MULLE_CORE_SRC_DIR="$SRC_DIR\\mulle-core"
8484
MULLE_ATINIT_SRC_DIR="$SRC_DIR\\mulle-atinit"
@@ -96,7 +96,6 @@ jobs:
9696
echo "MULLE_CORE_SRC_DIR=$MULLE_CORE_SRC_DIR" >> $GITHUB_OUTPUT
9797
echo "MULLE_ATINIT_SRC_DIR=$MULLE_ATINIT_SRC_DIR" >> $GITHUB_OUTPUT
9898
echo "MULLE_ATEXIT_SRC_DIR=$MULLE_ATEXIT_SRC_DIR" >> $GITHUB_OUTPUT
99-
echo "MULLE_SDK_PATH=$MULLE_SDK_PATH" >> $GITHUB_OUTPUT
10099
mkdir -p "$SRC_DIR"
101100
mkdir -p "$INSTALL_DIR"
102101
@@ -107,10 +106,10 @@ jobs:
107106
- name: Configure, build and install mulle-core with CMake
108107
working-directory: "${{steps.set-install-dir.outputs.MULLE_CORE_SRC_DIR}}"
109108
run: |
110-
export MULLE_SDK_PATH=${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}
109+
export MULLE_SDK_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}"
111110
cmake -B build \
112-
-DCMAKE_INSTALL_PREFIX=${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }} \
113-
-DCMAKE_PREFIX_PATH=${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }} \
111+
-DCMAKE_INSTALL_PREFIX="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
112+
-DCMAKE_PREFIX_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
114113
-DCMAKE_BUILD_TYPE=Release
115114
cmake --build build --config Release
116115
cmake --install build --config Release
@@ -123,10 +122,10 @@ jobs:
123122
- name: Configure, build and install mulle-atinit with CMake
124123
working-directory: "${{steps.set-install-dir.outputs.MULLE_ATINIT_SRC_DIR}}"
125124
run: |
126-
export MULLE_SDK_PATH=${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}
125+
export MULLE_SDK_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}"
127126
cmake -B build \
128-
-DCMAKE_INSTALL_PREFIX=${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }} \
129-
-DCMAKE_PREFIX_PATH=${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }} \
127+
-DCMAKE_INSTALL_PREFIX="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
128+
-DCMAKE_PREFIX_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
130129
-DCMAKE_BUILD_TYPE=Release
131130
cmake --build build --config Release
132131
cmake --install build --config Release
@@ -139,10 +138,10 @@ jobs:
139138
- name: Configure, build and install mulle-atexit with CMake
140139
working-directory: "${{steps.set-install-dir.outputs.MULLE_ATEXIT_SRC_DIR}}"
141140
run: |
142-
export MULLE_SDK_PATH=${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}
141+
export MULLE_SDK_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}"
143142
cmake -B build \
144-
-DCMAKE_INSTALL_PREFIX=${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }} \
145-
-DCMAKE_PREFIX_PATH=${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }} \
143+
-DCMAKE_INSTALL_PREFIX="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
144+
-DCMAKE_PREFIX_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}" \
146145
-DCMAKE_BUILD_TYPE=Release
147146
cmake --build build --config Release
148147
cmake --install build --config Release
@@ -156,12 +155,12 @@ jobs:
156155
- name: Generate project files
157156
run: |
158157
export MULLE_SDK_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}"
159-
cmake -S ${{ matrix.src-dir || '.' }} -B ${{ matrix.build-dir || '.' }} ${{ matrix.cmake-args }} \
160-
-DCMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} \
161-
-DCMAKE_PREFIX_PATH=${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}
158+
cmake -S "${{ matrix.src-dir || '.' }}" -B "${{ matrix.build-dir || '.' }}" "${{ matrix.cmake-args }}" \
159+
-DCMAKE_BUILD_TYPE="${{ matrix.build-config || 'Release' }}" \
160+
-DCMAKE_PREFIX_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}"
162161
env:
163162
CC: ${{ matrix.compiler }}
164163
CFLAGS: ${{ matrix.cflags }}
165164

166165
- name: Compile source code
167-
run: cmake --build ${{ matrix.build-dir || '.' }} --config ${{ matrix.build-config || 'Release' }}
166+
run: cmake --build "${{ matrix.build-dir || '.' }}" --config "${{ matrix.build-config || 'Release' }}"

0 commit comments

Comments
 (0)