Skip to content

Merge from microsoft/vcpkg#521

Merged
Jimmy-Hu merged 4 commits intoJimmy-Hu:masterfrom
microsoft:master
Jan 29, 2021
Merged

Merge from microsoft/vcpkg#521
Jimmy-Hu merged 4 commits intoJimmy-Hu:masterfrom
microsoft:master

Conversation

@Jimmy-Hu
Copy link
Owner

Merge from microsoft/vcpkg

c72578 and others added 4 commits January 28, 2021 19:34
* [pugixml] Update to 1.11.4

* update version

* Update ci.baseline.txt

Add paraview:x64-linux=fail

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>
* vcpkg_configure_make: Support macOS cross-compile

* Move compiler flags logic to get_cmake_vars

* Better match the arch behavior of config.guess

* Apply suggestions from code review

Co-authored-by: Billy O'Neal <bion@microsoft.com>

Co-authored-by: Billy O'Neal <bion@microsoft.com>
* [libpq] Fix install tool pg_config

* update baseline

* [libpq] Use vcpkg_copy_tool_dependencies instead

* update baseline

* [libpq] Fix install tool pg_config

* update baseline

* [libpq] Use vcpkg_copy_tool_dependencies instead

* update baseline
Co-authored-by: Charles Barto <barto.charlie@gmail.com>
@Jimmy-Hu Jimmy-Hu merged commit b4d3723 into Jimmy-Hu:master Jan 29, 2021
Jimmy-Hu pushed a commit that referenced this pull request Jun 12, 2024
Fixes danielaparker/jsoncons #519 
Fixes danielaparker/jsoncons #509
Fixes danielaparker/jsoncons #520 
Fixes danielaparker/jsoncons #521 
Fixes danielaparker/jsoncons #518
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants