Skip to content

Commit c1405fa

Browse files
committed
More fixes to handle Ninja vs Studio
Signed-off-by: Russell McGuire <russell.w.mcguire@intel.com>
1 parent fc67563 commit c1405fa

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

.github/workflows/build-multi-static.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,15 @@ jobs:
128128
- name: Build (Windows)
129129
if: matrix.os.name == 'windows'
130130
run: |
131+
$ws = "${{ github.workspace }}".Replace('\', '/')
131132
mkdir build
132133
cd build
133134
cmake `
134135
-G "Ninja" `
135136
-D CMAKE_BUILD_TYPE=Release `
136137
-D BUILD_STATIC=1 `
137138
-D CMAKE_INSTALL_PREFIX="${{ matrix.target == 'install' && '../level-zero-install' || matrix.target == 'package' && 'C:/Program Files' || '' }}" `
138-
-D CPACK_OUTPUT_FILE_PREFIX="${{ github.workspace }}/level-zero-package" `
139+
-D CPACK_OUTPUT_FILE_PREFIX="$ws/level-zero-package" `
139140
..
140141
cmake --build . --target ${{ matrix.target }}
141142
shell: powershell

.github/workflows/build-multi.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,14 @@ jobs:
133133
- name: Build (Windows)
134134
if: matrix.os.name == 'windows'
135135
run: |
136+
$ws = "${{ github.workspace }}".Replace('\', '/')
136137
mkdir build
137138
cd build
138139
cmake `
139140
-G "Ninja" `
140141
-D CMAKE_BUILD_TYPE=Release `
141142
-D CMAKE_INSTALL_PREFIX="${{ matrix.target == 'install' && '../level-zero-install' || matrix.target == 'package' && 'C:/Program Files' || '' }}" `
142-
-D CPACK_OUTPUT_FILE_PREFIX="${{ github.workspace }}/level-zero-package" `
143+
-D CPACK_OUTPUT_FILE_PREFIX="$ws/level-zero-package" `
143144
..
144145
cmake --build . --target ${{ matrix.target }}
145146
shell: powershell

0 commit comments

Comments
 (0)