Skip to content

Commit

Permalink
windows/libuv: Resolve build path issue
Browse files Browse the repository at this point in the history
Newer versions of cmake output to build/configuration_type
Both output types now supported.
  • Loading branch information
mribbons authored and chicoxyzzy committed Feb 4, 2023
1 parent 10ee4f8 commit b1bc1d4
Showing 1 changed file with 14 additions and 3 deletions.
17 changes: 14 additions & 3 deletions bin/install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,20 @@ Function Build {
Write-Output "ok - built libuv"

(New-Item -ItemType Directory -Force -Path "$WORKING_BUILD_PATH\lib") > $null
Copy-Item "$WORKING_BUILD_PATH\libuv\build\uv_a.lib" -Destination "$WORKING_BUILD_PATH\lib\uv_a.lib"
if ($debug -eq $true) {
Copy-Item "$WORKING_BUILD_PATH\libuv\build\uv_a.pdb" -Destination "$WORKING_BUILD_PATH\lib\uv_a.pdb"
if ((Test-Path -Path "$WORKING_BUILD_PATH\libuv\build\$LIBUV_BUILD_TYPE\uv_a.lib" -PathType Leaf)) {
Copy-Item "$WORKING_BUILD_PATH\libuv\build\$LIBUV_BUILD_TYPE\uv_a.lib" -Destination "$WORKING_BUILD_PATH\lib\uv_a.lib"
if ($debug -eq $true) {
Copy-Item "$WORKING_BUILD_PATH\libuv\build\$LIBUV_BUILD_TYPE\uv_a.pdb" -Destination "$WORKING_BUILD_PATH\lib\uv_a.pdb"
}
} elseif ((Test-Path -Path "$WORKING_BUILD_PATH\libuv\build\uv_a.lib" -PathType Leaf)) {
# Support older versions of cmake that don't build to --config type path on multibuild systems
Copy-Item "$WORKING_BUILD_PATH\libuv\build\uv_a.lib" -Destination "$WORKING_BUILD_PATH\lib\uv_a.lib"
if ($debug -eq $true) {
Copy-Item "$WORKING_BUILD_PATH\libuv\build\uv_a.pdb" -Destination "$WORKING_BUILD_PATH\lib\uv_a.pdb"
}
} else {
Write-Output "Stop: uv_a.lib not found"
Exit 1
}

(New-Item -ItemType Directory -Force -Path "$WORKING_BUILD_PATH\include") > $null
Expand Down

0 comments on commit b1bc1d4

Please sign in to comment.