diff options
| author | Martin Vejdarski <extrulm@gmail.com> | 2020-05-20 05:20:18 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-19 15:20:18 -0700 |
| commit | ec2b59b93e168d4f25f1935afb86f038b0122938 (patch) | |
| tree | b0f2547c31a19f5ce687cf848269827ef10ed633 /scripts | |
| parent | edfc5ac1c33e5d1322249811c0a84f8e02c3e538 (diff) | |
| download | vcpkg-ec2b59b93e168d4f25f1935afb86f038b0122938.tar.gz vcpkg-ec2b59b93e168d4f25f1935afb86f038b0122938.zip | |
[harfbuzz,skia] Update and replace Skia dependencies with vcpkg (#11416)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/azure-pipelines/windows/initialize-environment.ps1 | 2 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_install_gn.cmake | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/scripts/azure-pipelines/windows/initialize-environment.ps1 b/scripts/azure-pipelines/windows/initialize-environment.ps1 index 8b1d8e8e4..4211a228a 100644 --- a/scripts/azure-pipelines/windows/initialize-environment.ps1 +++ b/scripts/azure-pipelines/windows/initialize-environment.ps1 @@ -25,7 +25,7 @@ $StorageAccountKey = $env:StorageAccountKey function Remove-DirectorySymlink {
Param([string]$Path)
if (Test-Path $Path) {
- [System.IO.Directory]::Delete($Path)
+ [System.IO.Directory]::Delete($Path, $true)
}
}
diff --git a/scripts/cmake/vcpkg_install_gn.cmake b/scripts/cmake/vcpkg_install_gn.cmake index 33c2b7301..29a87a6cd 100644 --- a/scripts/cmake/vcpkg_install_gn.cmake +++ b/scripts/cmake/vcpkg_install_gn.cmake @@ -68,6 +68,12 @@ function(vcpkg_install_gn) string(REGEX REPLACE "^/" "" OUTPUT "${OUTPUT}") endif() endif() + + if(NOT EXISTS "${OUTPUT}") + message(STATUS "Output for target, ${TARGET} doesn't exist: ${OUTPUT}.") + continue() + endif() + if(TARGET_TYPE STREQUAL "executable") file(INSTALL "${OUTPUT}" DESTINATION "${INSTALL_DIR}/tools") elseif("${OUTPUT}" MATCHES "(\\.dll|\\.pdb)$") |