From 2693196c45dd0c94c18747caf429b0185ffa3957 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sat, 13 Mar 2021 09:59:28 -0500 Subject: [PATCH] GitHub Actions: Replace \ with / in Windows CMake paths --- .github/workflows/build.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 430d6f7a5..d3c49ad4a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -173,9 +173,10 @@ jobs: - name: Configure CMake working-directory: ${{github.workspace}}/build run: | + $workspace = $env:RUNNER_WORKSPACE -replace '\\', '/' cmake $env:GITHUB_WORKSPACE -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DURDE_VECTOR_ISA=sse41 ` -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DCMAKE_CXX_FLAGS= -DCMAKE_C_FLAGS= ` - -DLLVM_ROOT_DIR="$env:RUNNER_WORKSPACE/LLVM" ` + -DLLVM_ROOT_DIR="$workspace/LLVM" ` -DURDE_DLPACKAGE=urde-$env:GITHUB_RUN_NUMBER-win32-msvc-x86_64 - name: Build @@ -249,12 +250,13 @@ jobs: - name: Configure CMake working-directory: ${{github.workspace}}/build run: | + $workspace = $env:RUNNER_WORKSPACE -replace '\\', '/' cmake $env:GITHUB_WORKSPACE -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DURDE_VECTOR_ISA=sse41 ` -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded ` - -DCMAKE_C_COMPILER="$env:RUNNER_WORKSPACE/LLVM/bin/clang-cl.exe" ` - -DCMAKE_CXX_COMPILER="$env:RUNNER_WORKSPACE/LLVM/bin/clang-cl.exe" ` - -DCMAKE_LINKER="$env:RUNNER_WORKSPACE/LLVM/bin/lld-link.exe" ` - -DLLVM_ROOT_DIR="$env:RUNNER_WORKSPACE/LLVM" ` + -DCMAKE_C_COMPILER="$workspace/LLVM/bin/clang-cl.exe" ` + -DCMAKE_CXX_COMPILER="$workspace/LLVM/bin/clang-cl.exe" ` + -DCMAKE_LINKER="$workspace/LLVM/bin/lld-link.exe" ` + -DLLVM_ROOT_DIR="$workspace/LLVM" ` -DURDE_DLPACKAGE=urde-$env:GITHUB_RUN_NUMBER-win32-clang-x86_64 - name: Build