moar tweaky

Author: mulle-nat

.github/workflows/cmake-errors.yml

@@ -77,21 +77,22 @@ jobs:
         run: |
           if [ "$RUNNER_OS" == "Windows" ]
           then
-            SRC_DIR="$GITHUB_WORKSPACE\\tmp"
             INSTALL_DIR="$GITHUB_WORKSPACE\\usr"
+            CMAKE_INSTALL_DIR=="$(cygpath -u "$INSTALL_DIR")"
+            SRC_DIR="$GITHUB_WORKSPACE\\tmp"
             MULLE_CORE_SRC_DIR="$SRC_DIR\\mulle-core"
             MULLE_ATINIT_SRC_DIR="$SRC_DIR\\mulle-atinit"
             MULLE_ATEXIT_SRC_DIR="$SRC_DIR\\mulle-atexit"
-            MULLE_SDK_PATH="$(cygpath -w "$INSTALL_DIR")"
           else
-            SRC_DIR="$GITHUB_WORKSPACE/tmp"
             INSTALL_DIR="$GITHUB_WORKSPACE/usr"
+            CMAKE_INSTALL_DIR="${INSTALL_DIR}"
+            SRC_DIR="$GITHUB_WORKSPACE/tmp"
             MULLE_CORE_SRC_DIR="$SRC_DIR/mulle-core"
             MULLE_ATINIT_SRC_DIR="$SRC_DIR/mulle-atinit"
             MULLE_ATEXIT_SRC_DIR="$SRC_DIR/mulle-atexit"
-            MULLE_SDK_PATH="${INSTALL_DIR}"
           fi
           echo "INSTALL_DIR=$INSTALL_DIR"                   >> $GITHUB_OUTPUT
+          echo "CMAKE_INSTALL_DIR=$CMAKE_INSTALL_DIR"       >> $GITHUB_OUTPUT
           echo "MULLE_CORE_SRC_DIR=$MULLE_CORE_SRC_DIR"     >> $GITHUB_OUTPUT
           echo "MULLE_ATINIT_SRC_DIR=$MULLE_ATINIT_SRC_DIR" >> $GITHUB_OUTPUT
           echo "MULLE_ATEXIT_SRC_DIR=$MULLE_ATEXIT_SRC_DIR" >> $GITHUB_OUTPUT
@@ -106,10 +107,10 @@ jobs:
       - name: Configure, build and install mulle-core with CMake
         working-directory: "${{steps.set-install-dir.outputs.MULLE_CORE_SRC_DIR}}"
         run: |
-          export MULLE_SDK_PATH=${{ steps.set-install-dir.outputs.INSTALL_DIR }}
+          export MULLE_SDK_PATH=${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}
           cmake -B build \
-            -DCMAKE_INSTALL_PREFIX=${{ steps.set-install-dir.outputs.INSTALL_DIR }} \
-            -DCMAKE_PREFIX_PATH=${{ steps.set-install-dir.outputs.INSTALL_DIR }} \
+            -DCMAKE_INSTALL_PREFIX=${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }} \
+            -DCMAKE_PREFIX_PATH=${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }} \
             -DCMAKE_BUILD_TYPE=Release
           cmake --build build --config Release
           cmake --install build --config Release
@@ -122,10 +123,10 @@ jobs:
       - name: Configure, build and install mulle-atinit with CMake
         working-directory: "${{steps.set-install-dir.outputs.MULLE_ATINIT_SRC_DIR}}"
         run: |
-          export MULLE_SDK_PATH=${{ steps.set-install-dir.outputs.INSTALL_DIR }}
+          export MULLE_SDK_PATH=${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}
           cmake -B build \
-            -DCMAKE_INSTALL_PREFIX=${{ steps.set-install-dir.outputs.INSTALL_DIR }} \
-            -DCMAKE_PREFIX_PATH=${{ steps.set-install-dir.outputs.INSTALL_DIR }} \
+            -DCMAKE_INSTALL_PREFIX=${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }} \
+            -DCMAKE_PREFIX_PATH=${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }} \
             -DCMAKE_BUILD_TYPE=Release
           cmake --build build --config Release
           cmake --install build --config Release
@@ -138,10 +139,10 @@ jobs:
       - name: Configure, build and install mulle-atexit with CMake
         working-directory: "${{steps.set-install-dir.outputs.MULLE_ATEXIT_SRC_DIR}}"
         run: |
-          export MULLE_SDK_PATH=${{ steps.set-install-dir.outputs.INSTALL_DIR }}
+          export MULLE_SDK_PATH=${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}
           cmake -B build \
-            -DCMAKE_INSTALL_PREFIX=${{ steps.set-install-dir.outputs.INSTALL_DIR }} \
-            -DCMAKE_PREFIX_PATH=${{ steps.set-install-dir.outputs.INSTALL_DIR }} \
+            -DCMAKE_INSTALL_PREFIX=${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }} \
+            -DCMAKE_PREFIX_PATH=${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }} \
             -DCMAKE_BUILD_TYPE=Release
           cmake --build build --config Release
           cmake --install build --config Release
@@ -154,10 +155,10 @@ jobs:
           
       - name: Generate project files
         run: |
-          export MULLE_SDK_PATH="${{ steps.set-install-dir.outputs.MULLE_SDK_PATH }}"
+          export MULLE_SDK_PATH="${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}"
           cmake -S ${{ matrix.src-dir || '.' }} -B ${{ matrix.build-dir || '.' }} ${{ matrix.cmake-args }} \
             -DCMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} \
-            -DCMAKE_PREFIX_PATH=${{ steps.set-install-dir.outputs.INSTALL_DIR }}
+            -DCMAKE_PREFIX_PATH=${{ steps.set-install-dir.outputs.CMAKE_INSTALL_DIR }}
         env:
           CC: ${{ matrix.compiler }}
           CFLAGS: ${{ matrix.cflags }}