Skip to content

[sdl2pp] fix dependency error #30085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dan-shaw merged 7 commits into from
Mar 14, 2023
Merged

[sdl2pp] fix dependency error #30085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
36cc9ad
fix sdl2pp dependency
jimwang118 Mar 8, 2023
4900352
update version
jimwang118 Mar 8, 2023
fca8707
update version
jimwang118 Mar 8, 2023
3bd9a31
fix CI error
jimwang118 Mar 9, 2023
ceffc17
update version
jimwang118 Mar 9, 2023
9bd1bd5
fix dependency
jimwang118 Mar 9, 2023
ec7d111
update version
jimwang118 Mar 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/sdl2pp/fix-dependencies.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ index cdfd2a6..dc08748 100644
FIND_PACKAGE(SDL2_mixer REQUIRED)
SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS} ${SDL2_MIXER_INCLUDE_DIR})
- SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} ${SDL2_MIXER_LIBRARY})
+ SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} SDL2_mixer::SDL2_mixer)
+ SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} $<IF:$<TARGET_EXISTS:SDL2_mixer::SDL2_mixer>,SDL2_mixer::SDL2_mixer,SDL2_mixer::SDL2_mixer-static>)
SET(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_mixer")
ELSE(SDL2PP_WITH_MIXER)
MESSAGE(STATUS "SDL2_mixer support disabled")
Expand Down
7 changes: 7 additions & 0 deletions ports/sdl2pp/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ vcpkg_fixup_pkgconfig()

vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/FindSDL2PP.cmake" "HINTS \"${CURRENT_PACKAGES_DIR}/include\"" "")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/FindSDL2PP.cmake" "HINTS \"${CURRENT_PACKAGES_DIR}/lib\"" "")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/FindSDL2PP.cmake" "# SDL2PP_LIBRARIES"
[[# SDL2PP_LIBRARIES
include(CMakeFindDependencyMacro)
find_dependency(SDL2 CONFIG)
find_dependency(SDL2_image CONFIG)
find_dependency(SDL2_ttf CONFIG)
find_dependency(SDL2_mixer CONFIG)]])

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
Expand Down
2 changes: 1 addition & 1 deletion ports/sdl2pp/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "sdl2pp",
"version": "0.16.1",
"port-version": 6,
"port-version": 7,
"description": "C++11 bindings/wrapper for SDL2",
"homepage": "https://sdl2pp.amdmi3.ru",
"license": "Zlib",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7122,7 +7122,7 @@
},
"sdl2pp": {
"baseline": "0.16.1",
"port-version": 6
"port-version": 7
},
"seacas": {
"baseline": "2022-11-22",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/sdl2pp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bad32a45cda4bfc70197d99e62b840794bd0b747",
"version": "0.16.1",
"port-version": 7
},
{
"git-tree": "064e16bf7d04b929d0175c6c0aff6486032370db",
"version": "0.16.1",
Expand Down