Clean up dependencies, especially zlib-ng. #1265
Merged
+20
−61
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR cleans up some weirdness I noticed while investigating the Android build failure in CesiumGS/cesium-unreal#1748.
We had our own custom find script for zlib-ng, even though it has its own. Perhaps we thought we needed it because we had the name of the import library wrong? Or perhaps the built-in one was added in a more recent vcpkg release? Either way, it's not needed anymore, so I removed it and fixed the library name (
zlib-ng::zlib-ng->zlib-ng::zlib).Other changes:
find_packagefor curl. Looks like a merge error.Config.cmake.inwith some recent third-party library changes. @timoore I'm not especially well equipped to test this one, so you should take a look and make sure I haven't broken something.There's a
cesium-unrealbranch with the same name to demonstrate this still works ok in Unreal.