[libtheora] add unofficial cmake config, remove FindOGG.cmake #13783
Conversation
mcmtroffaes
force-pushed
the
feature/libtheora-config
branch
from
4d11075 to
0f6714e
Compare
ports/libtheora/CMakeLists.txt
Outdated
| @@ -12,7 +12,7 @@ file(GLOB HEADERS | |||
| ) | |||
|
|
|||
| include_directories("include") | |||
| include_directories(${OGG_INCLUDE_DIR}) | |||
| include_directories(${Ogg_INCLUDE_DIR}) | |||
There was a problem hiding this comment.
| include_directories(${Ogg_INCLUDE_DIR}) |
This should be handled automatically by the Ogg::ogg target.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Adding a target_link_libraries against Ogg for the object libraries fixed it. I've just pushed another commit to this effect.
There was a problem hiding this comment.
The targets may need have target_include_directories(
There was a problem hiding this comment.
Ah, good point. Might as well fix that too.
PhoebeHui
added
category:port-feature
|
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. |
PhoebeHui
added
info:reviewed
|
You're welcome. I've submitted the cmake work to upstream here: Whilst I was at it, I've also submitted the patch by @Mixaill (which fixes the debug build) to upstream: |
|
/azp run |
|
No pipelines are associated with this pull request. |
|
Thanks for the PR! |
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.