Skip to content

Conversation

@mcmtroffaes
Copy link
Contributor

  • What does your PR fix? This adds cmake config file for unofficial::theora targets, to use by other ports and consumers of vcpkg. It also removes the FindOGG.cmake since libogg in vcpkg already provides a config file. Tested on x64-linux, x64-windows, and x64-windows-static.

  • Which triplets are supported/not supported? Have you updated the CI baseline? No changes.

  • Does your PR follow the maintainer guide? Yes.

@mcmtroffaes mcmtroffaes force-pushed the feature/libtheora-config branch from 4d11075 to 0f6714e Compare September 28, 2020 16:16
@PhoebeHui PhoebeHui self-assigned this Sep 29, 2020
Copy link
Contributor

@ras0219 ras0219 left a comment

Choose a reason for hiding this comment

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

Thanks for the PR!


include_directories("include")
include_directories(${OGG_INCLUDE_DIR})
include_directories(${Ogg_INCLUDE_DIR})
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
include_directories(${Ogg_INCLUDE_DIR})

This should be handled automatically by the Ogg::ogg target.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, and yes, I realised that. I tried deleting it but for some reason it does not find the headers for some files that are compiled. I'm going to see if I can get to the root of this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Adding a target_link_libraries against Ogg for the object libraries fixed it. I've just pushed another commit to this effect.

Copy link
Contributor

Choose a reason for hiding this comment

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

The targets may need have target_include_directories(${target} PUBLIC $<INSTALL_INTERFACE:include>)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, good point. Might as well fix that too.

@PhoebeHui PhoebeHui added category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist requires:author-response labels Sep 29, 2020
@mcmtroffaes
Copy link
Contributor Author

mcmtroffaes commented Sep 29, 2020

Thanks @ras0219 @PhoebeHui for your comments. I think I've now done everything and done another series of tests to ensure it's all compiling as it should. Let me know if you still spot some issues.

I'll try to get this cmake file included and maintained upstream. Not that theora still gets a lot of development, but it can't hurt trying, and it feels like the right thing to do.

Copy link
Contributor

@PhoebeHui PhoebeHui left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for your updates!

@PhoebeHui PhoebeHui added info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. and removed requires:author-response labels Sep 30, 2020
@mcmtroffaes
Copy link
Contributor Author

You're welcome. I've submitted the cmake work to upstream here:

xiph/theora#14

Whilst I was at it, I've also submitted the patch by @Mixaill (which fixes the debug build) to upstream:

xiph/theora#13

@dan-shaw
Copy link
Contributor

dan-shaw commented Oct 6, 2020

/azp run

@azure-pipelines
Copy link

No pipelines are associated with this pull request.

@dan-shaw dan-shaw merged commit 7603103 into microsoft:master Oct 13, 2020
@dan-shaw
Copy link
Contributor

Thanks for the PR!

@mcmtroffaes mcmtroffaes deleted the feature/libtheora-config branch October 14, 2020 07:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants