Fixed link for webp, now using TARGET_LIBRARIES_VARS #2370
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks as usual Dan ;) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
WebP plug-in now works in both release mode and debug mode.
In 6ac221f the linking statements got updated dramatically. This caused a ripple effect such that webp plug-in would work in release mode MSVC 2022, but in debug mode MSVC 2022 it built and failed to run. This is because after that changeset, webp started to link to
osg.libin release mode AND debug mode. Before this changeset, it linked toosgd.lib.This PR fixes the behavior by using the
TARGET_LIBRARIES_VARSinstead of editingTARGET_COMMON_LIBRARIES. This allows the CMake code to pick the debug libraries for OSG when configured with debug libraries. After this change, webp starts working again in debug mode.This has no impact on release osgEarth, but fixes a critical break in debug osgEarth.