Skip to content

[sdl2pp] Update to 0.16.1 and fix find_package error #13300

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
strega-nil merged 3 commits into from
Nov 9, 2020
Merged

[sdl2pp] Update to 0.16.1 and fix find_package error #13300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06b8a1f
[sdl2pp] Fix find_package error
LilyWangL Sep 2, 2020
5761038
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
LilyWangL Nov 4, 2020
940ecd2
[sdl2pp] Update to version 0.16.1
LilyWangL Nov 4, 2020
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/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: sdl2pp
Version: 0.16.0-2
Version: 0.16.1
Description: C++11 bindings/wrapper for SDL2
Homepage: https://sdl2pp.amdmi3.ru
Build-Depends: sdl2, sdl2-mixer, sdl2-image, sdl2-ttf
12 changes: 6 additions & 6 deletions ports/sdl2pp/fix-dependencies.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a02376..ecd34d5 100644
index cdfd2a6..dc08748 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,11 +27,15 @@ ENDIF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
@@ -23,11 +23,15 @@ ENDIF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)

# depends
FIND_PACKAGE(SDL2 REQUIRED)
Expand All @@ -22,7 +22,7 @@ index 2a02376..ecd34d5 100644

IF(MINGW)
SET(MINGW32_LIBRARY "mingw32" CACHE STRING "mingw32 library")
@@ -40,27 +44,27 @@ IF(MINGW)
@@ -36,27 +40,27 @@ IF(MINGW)
ENDIF(MINGW)

IF(SDL2PP_WITH_IMAGE)
Expand Down Expand Up @@ -59,15 +59,15 @@ index 2a02376..ecd34d5 100644
SET(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_mixer")
ELSE(SDL2PP_WITH_MIXER)
MESSAGE(STATUS "SDL2_mixer support disabled")
@@ -94,7 +98,6 @@ ELSE(MSVC)
#APPEND_CXX_FLAG_IF_SUPPORTED(-Wno-padded SDL2PP_WARNINGS)
@@ -81,7 +85,6 @@ ELSE(MSVC)
ENDIF()
ENDIF(MSVC)

-LIST(REMOVE_DUPLICATES SDL2_ALL_INCLUDE_DIRS)

INCLUDE_DIRECTORIES(BEFORE ${PROJECT_SOURCE_DIR})
INCLUDE_DIRECTORIES(SYSTEM ${SDL2_ALL_INCLUDE_DIRS})
@@ -217,10 +220,10 @@ IF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
@@ -200,10 +203,10 @@ IF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
OPTION(SDL2PP_STATIC "Build static library instead of shared one" OFF)

# library
Expand Down
6 changes: 4 additions & 2 deletions ports/sdl2pp/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libSDL2pp/libSDL2pp
REF 0.16.0
SHA512 36603a0b1c3ba9294fffa5368357866e5689ceed9743352ff52c096d8b0070cc3f8708a5e837c10c871b410b6bda3ed7e8e3b95cb9afc136d91afb035cde6361
REF a02d5a81c3d4122cb578fcd1e5cd4e836878f63b # 0.16.1
SHA512 cf08abe69b3d313d1c3f63cb138f05105453ea0d04e26daa6d85da41cb742912a37766cce1f8af1277e92a227ea75f481f07bff76f0b501fadec392b8b62336a
HEAD_REF master
PATCHES fix-dependencies.patch
)
Expand All @@ -29,5 +29,7 @@ vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
# Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
4 changes: 4 additions & 0 deletions ports/sdl2pp/usage
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
The package sdl2pp provides CMake targets:

find_package(SDL2PP REQUIRED)
target_include_directories(main PRIVATE ${SDL2PP_INCLUDE_DIRS})
6 changes: 6 additions & 0 deletions ports/sdl2pp/vcpkg-cmake-wrapper.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
set(SDL2PP_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/../cmake/Modules)

_find_package(${ARGS})

set(CMAKE_MODULE_PATH ${SDL2PP_PREV_MODULE_PATH})