Skip to content

Conversation

JackBoosY
Copy link
Contributor

Currently, the xlib header file in cairo is not installed when feature x11 is activated. Fix it.

Fixes #11813

@JackBoosY JackBoosY added category:port-bug The issue is with a library, which is something the port should already support info:internal labels Jun 10, 2020
@JackBoosY JackBoosY marked this pull request as ready for review June 10, 2020 08:20
@JackBoosY JackBoosY requested a review from NancyLi1013 June 10, 2020 08:20
@NancyLi1013 NancyLi1013 added the info:reviewed Pull Request changes follow basic guidelines label Jun 11, 2020
# Add include directories
include_directories(".")
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
if(WIN32)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Relatively CMake newbie question: Isn't the old code explicitly referencing CMAKE_SYSTEM_NAME better because it's more unambiguously talking about the target system rather than the host/build system?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think they are equivalent and better indicate their corresponding platforms.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is fine for now; vcpkg doesn't really differentiate between a host and a target.

vcpkg_copy_pdbs()

vcpkg_test_cmake(PACKAGE_NAME unofficial-cairo)
#vcpkg_test_cmake(PACKAGE_NAME unofficial-cairo)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably don't want to check in commented out code...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function may be re-enabled in the future, so I just comment it out here to make it easier to mark the port for this function later.

@dan-shaw dan-shaw merged commit 1caebee into microsoft:master Jun 11, 2020
@JackBoosY JackBoosY deleted the dev/jack/11813 branch June 11, 2020 09:43
JangBoo pushed a commit to JangBoo/vcpkg that referenced this pull request Jun 18, 2020
…osoft#11868)

* [cairo] Install the xlib header file when selecting feature x11

* update baseline

* Update CMakeLists.txt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[cairo] io2d build failure on Ubuntu
4 participants