Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[vcpkg] Check in baseline results for CI builds #9203

Merged
merged 8 commits into from
Dec 6, 2019
Merged

[vcpkg] Check in baseline results for CI builds #9203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3848847
[vcpkg] Check in initial baseline
ras0219-msft Dec 3, 2019
7881f24
[vcpkg] Baseline update
ras0219-msft Dec 3, 2019
5c55270
[vcpkg] Further baseline updates
ras0219-msft Dec 5, 2019
306ded9
[vcpkg] Update baseline
ras0219-msft Dec 5, 2019
611ccbc
[vcpkg] Update baseline
ras0219-msft Dec 6, 2019
81c8f27
[vcpkg] Update baseline
ras0219-msft Dec 6, 2019
caece28
[vcpkg] Update baseline
ras0219-msft Dec 6, 2019
6c6f97c
[xalan-c] Fix flaky build for non-Windows hosts
ras0219-msft Dec 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/xalan-c/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: xalan-c
Version: 1.11-9
Version: 1.11-10
Homepage: https://github.com/apache/xalan-c
Description: Xalan is an XSLT processor for transforming XML documents into HTML, text, or other XML document types
Build-Depends: xerces-c
20 changes: 20 additions & 0 deletions ports/xalan-c/fix-linux-no-bin.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/src/xalanc/Utils/CMakeLists.txt b/src/xalanc/Utils/CMakeLists.txt
index 2d78685..72b611b 100644
--- a/src/xalanc/Utils/CMakeLists.txt
+++ b/src/xalanc/Utils/CMakeLists.txt
@@ -41,11 +41,15 @@ add_custom_target(locale ALL)
set_target_properties(locale PROPERTIES FOLDER "Message Library")

# workaround for case of missing xerces-c dll
+if(CMAKE_HOST_WIN32)
if(EXISTS ${XercesC_INCLUDE_DIR}/../bin)
set(MsgCreator_WD $<TARGET_FILE_DIR:XercesC::XercesC>/../bin)
else()
set(MsgCreator_WD "${XSL_NLS_GEN_DIR}")
endif()
+else()
+ set(MsgCreator_WD "${PROJECT_BINARY_DIR}")
+endif()

if(msgloader STREQUAL "inmemory")
add_custom_command(
1 change: 1 addition & 0 deletions ports/xalan-c/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ vcpkg_from_github(
PATCHES
fix-win-deprecated-err.patch
fix-missing-dll-error.patch
fix-linux-no-bin.patch
)

vcpkg_configure_cmake(
Expand Down
Loading