modules: Make FindSDL2.cmake also find debug libraries #45
Conversation
| if(SDL2_LIBRARY_DEBUG) | ||
| set_property(TARGET SDL2::SDL2 APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) | ||
| set_property(TARGET SDL2::SDL2 PROPERTY IMPORTED_LOCATION_DEBUG ${SDL2_LIBRARY_DEBUG}) | ||
| endif() | ||
| endif() |
There was a problem hiding this comment.
Hmm. What about the case where there is only a debug SDL build? (As far as I know, the macOS framework has only a release version, so you don't need to duplicate the workaround for a debug version.)
There was a problem hiding this comment.
What about the case where there is only a debug SDL build?
Then this script will not find anything (for backwards compatibility 😜) Will fix it.
And will remove the workaround
Squareys
force-pushed
the
find-sdl2-debug-libs
branch
from
fa0a8f4
to
5cfa5cf
Compare
|
@mosra Did the requested change, please double check if the "only debug libraries" situation is properly handled this way (I tested it locally, and it works, but maybe it's not the way to go?). |
modules/FindSDL2.cmake
Outdated
| @@ -118,12 +124,22 @@ if(NOT TARGET SDL2::SDL2) | |||
| endif() | |||
| add_library(SDL2::SDL2 ${_SDL2_IMPORTED_LIBRARY_KIND}) | |||
|
|
|||
|
|
|||
modules/FindSDL2.cmake
Outdated
| # Work around BUGGY framework support on macOS | ||
| # https://cmake.org/Bug/view.php?id=14105 | ||
| if(CORRADE_TARGET_APPLE AND ${SDL2_LIBRARY} MATCHES "\\.framework$") | ||
| set_property(TARGET SDL2::SDL2 PROPERTY IMPORTED_LOCATION ${SDL2_LIBRARY}/SDL2) | ||
| if(CORRADE_TARGET_APPLE AND ${SDL2_LIBRARY_RELEASE} MATCHES "\\.framework$") |
There was a problem hiding this comment.
I think this should be just if(CORRADE_TARGET_APPLE AND SDL2_LIBRARY_RELEASE MATCHES "\\.framework$"), so without the ${}. Not sure why I did it like that before, but with the change now I think this could fail if you are on Apple and have only the debug version.
There was a problem hiding this comment.
From the documentation of MATCHES I would think that both are valid, will change it, though.
Signed-off-by: Squareys <squareys@googlemail.com>
Squareys
force-pushed
the
find-sdl2-debug-libs
branch
from
5cfa5cf
to
9bcb257
Compare
|
@mosra Pushed again with new requested changes, I hope I correctly understood the comment for the apple stuff and there isn't more to do there than I did. |
|
Merged in mosra/magnum@52b7c26, now it also should be copied into all other repositories. |
Hi @mosra !
As discussed in #42 , here's the PR that fixed the find module to also find the debug libs so that they are properly copied in vcpkg builds.
Cheers, Jonathan