diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-12-07 05:50:24 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-07 05:50:24 -0800 |
| commit | ffed6950623fd17a0928a71e74d31d097b6dcc21 (patch) | |
| tree | 08d9f8924b65b495cb5a5e4d1fba6d6e8b5856c1 /scripts | |
| parent | 767909ad146aea8f4c949465df5bd7e1fc131a17 (diff) | |
| download | vcpkg-ffed6950623fd17a0928a71e74d31d097b6dcc21.tar.gz vcpkg-ffed6950623fd17a0928a71e74d31d097b6dcc21.zip | |
[libxslt] Fix writing to locations outside vcpkg in Windows builds (#9242)
* [libxslt] Fix writing to locations outside vcpkg in Windows builds
* [libxslt] Add passing arm64-windows to baseline
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ci.baseline.txt | 1 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_build_nmake.cmake | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 83351593b..94fd57187 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -925,7 +925,6 @@ libwebsockets:arm-uwp=fail libwebsockets:x64-uwp=fail
libxmp-lite:x64-linux=fail
libxmp-lite:x64-osx=fail
-libxslt:arm64-windows=fail
libxslt:arm-uwp=fail
libxslt:x64-osx=fail
libxslt:x64-uwp=fail
diff --git a/scripts/cmake/vcpkg_build_nmake.cmake b/scripts/cmake/vcpkg_build_nmake.cmake index 33f1e9d1e..8cf074739 100644 --- a/scripts/cmake/vcpkg_build_nmake.cmake +++ b/scripts/cmake/vcpkg_build_nmake.cmake @@ -178,7 +178,7 @@ function(vcpkg_build_nmake) endforeach()
if (_bn_PRERUN_SHELL)
- message("Prerunning ${CURRENT_TRIPLET_NAME}")
+ message(STATUS "Prerunning ${CURRENT_TRIPLET_NAME}")
vcpkg_execute_required_process(
COMMAND ${_bn_PRERUN_SHELL}
WORKING_DIRECTORY ${OBJ_DIR}${_bn_PROJECT_SUBPATH}
@@ -186,7 +186,7 @@ function(vcpkg_build_nmake) )
endif()
if (BUILDTYPE STREQUAL "debug" AND _bn_PRERUN_SHELL_DEBUG)
- message("Prerunning ${CURRENT_TRIPLET_NAME}")
+ message(STATUS "Prerunning ${CURRENT_TRIPLET_NAME}")
vcpkg_execute_required_process(
COMMAND "${_bn_PRERUN_SHELL_DEBUG}"
WORKING_DIRECTORY ${OBJ_DIR}${_bn_PROJECT_SUBPATH}
@@ -194,11 +194,11 @@ function(vcpkg_build_nmake) )
endif()
if (BUILDTYPE STREQUAL "release" AND _bn_PRERUN_SHELL_RELEASE)
- message("Prerunning ${CURRENT_TRIPLET_NAME}")
+ message(STATUS "Prerunning ${CURRENT_TRIPLET_NAME}")
vcpkg_execute_required_process(
COMMAND ${_bn_PRERUN_SHELL_RELEASE}
WORKING_DIRECTORY ${OBJ_DIR}${_bn_PROJECT_SUBPATH}
- LOGNAME "prerun-${CURRENT_TRIPLET_NAME}-dbg"
+ LOGNAME "prerun-${CURRENT_TRIPLET_NAME}-rel"
)
endif()
|