Skip to content

Commit 8c9b0ba

Browse files
authored
progress on cmake but tweaky tweak
1 parent 7fea5a3 commit 8c9b0ba

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

.github/workflows/cmake-errors.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,20 @@ jobs:
8282
MULLE_CORE_SRC_DIR="$SRC_DIR\\mulle-core"
8383
MULLE_ATINIT_SRC_DIR="$SRC_DIR\\mulle-atinit"
8484
MULLE_ATEXIT_SRC_DIR="$SRC_DIR\\mulle-atexit"
85+
MULLE_SDK_PATH="$(cygpath -w "$INSTALL_DIR")"
8586
else
8687
SRC_DIR="$GITHUB_WORKSPACE/tmp"
8788
INSTALL_DIR="$GITHUB_WORKSPACE/usr"
8889
MULLE_CORE_SRC_DIR="$SRC_DIR/mulle-core"
8990
MULLE_ATINIT_SRC_DIR="$SRC_DIR/mulle-atinit"
9091
MULLE_ATEXIT_SRC_DIR="$SRC_DIR/mulle-atexit"
92+
MULLE_SDK_PATH="${INSTALL_DIR}"
9193
fi
9294
echo "INSTALL_DIR=$INSTALL_DIR" >> $GITHUB_OUTPUT
9395
echo "MULLE_CORE_SRC_DIR=$MULLE_CORE_SRC_DIR" >> $GITHUB_OUTPUT
9496
echo "MULLE_ATINIT_SRC_DIR=$MULLE_ATINIT_SRC_DIR" >> $GITHUB_OUTPUT
9597
echo "MULLE_ATEXIT_SRC_DIR=$MULLE_ATEXIT_SRC_DIR" >> $GITHUB_OUTPUT
98+
echo "MULLE_SDK_PATH=$MULLE_SDK_PATH" >> $GITHUB_OUTPUT
9699
mkdir -p "$SRC_DIR"
97100
mkdir -p "$INSTALL_DIR"
98101
@@ -151,7 +154,7 @@ jobs:
151154
152155
- name: Generate project files
153156
run: |
154-
export MULLE_SDK_PATH=${{ steps.set-install-dir.outputs.INSTALL_DIR }}
157+
export MULLE_SDK_PATH="${{ steps.set-install-dir.outputs.MULLE_SDK_PATH }}"
155158
cmake -S ${{ matrix.src-dir || '.' }} -B ${{ matrix.build-dir || '.' }} ${{ matrix.cmake-args }} \
156159
-DCMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} \
157160
-DCMAKE_PREFIX_PATH=${{ steps.set-install-dir.outputs.INSTALL_DIR }}

0 commit comments

Comments
 (0)