mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 13:48:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[sdl2pp] no absolute paths (#21722)

Browse Source 
* [sdl2pp] no absolute paths

* [sdl2-image][sdl2-mixer][sdl2-ttf][sdl2pp] Install and fix .pc files

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
This commit is contained in:
autoantwort 2021-12-01 00:29:54 +01:00 committed by GitHub
parent ed74ff32c6
commit 7c92c79a1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 110 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ports/sdl2-image/CMakeLists.txt
View File

@ -115,6 +115,24 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/sdl2-image-config.cmake"
find_dependency(SDL2 CONFIG)
include("${CMAKE_CURRENT_LIST_DIR}/sdl2-image-targets.cmake")
]])
set(prefix "")
set(exec_prefix [[${prefix}]])
set(libdir [[${prefix}/lib]])
set(includedir [[${prefix}/include]])
set(PACKAGE "SDL2_image")
file(READ "SDL_image.h" header_contents)
# #define SDL_IMAGE_MAJOR_VERSION 2
# #define SDL_IMAGE_MINOR_VERSION 0
# #define SDL_IMAGE_PATCHLEVEL 5
string(REGEX MATCH "define *SDL_IMAGE_MAJOR_VERSION *([0-9]+)" _ "${header_contents}")
set(VERSION ${CMAKE_MATCH_1})
string(REGEX MATCH "define *SDL_IMAGE_MINOR_VERSION *([0-9]+)" _ "${header_contents}")
string(APPEND VERSION ".${CMAKE_MATCH_1}")
string(REGEX MATCH "define *SDL_IMAGE_PATCHLEVEL *([0-9]+)" _ "${header_contents}")
string(APPEND VERSION ".${CMAKE_MATCH_1}")
set(SDL_VERSION 0.0)
configure_file(SDL2_image.pc.in "${CMAKE_CURRENT_BINARY_DIR}/SDL2_image.pc" @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SDL2_image.pc DESTINATION lib/pkgconfig)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sdl2-image-config.cmake DESTINATION share/sdl2-image)

1
ports/sdl2-image/portfile.cmake
View File

@ -42,6 +42,7 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets()
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

2
ports/sdl2-image/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "sdl2-image",
"version-string": "2.0.5",
"port-version": 2,
"port-version": 3,
"description": "SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV",
"homepage": "https://www.libsdl.org/projects/SDL_image",
"dependencies": [

19
ports/sdl2-mixer/CMakeLists.txt
View File

@ -137,6 +137,25 @@ install(EXPORT SDL2_mixer
NAMESPACE SDL2::
)
set(prefix "")
set(exec_prefix [[${prefix}]])
set(libdir [[${prefix}/lib]])
set(includedir [[${prefix}/include]])
set(PACKAGE "SDL2_mixer")
file(READ "SDL_mixer.h" header_contents)
# #define SDL_MIXER_MAJOR_VERSION 2
# #define SDL_MIXER_MINOR_VERSION 0
# #define SDL_MIXER_PATCHLEVEL 5
string(REGEX MATCH "define *SDL_MIXER_MAJOR_VERSION *([0-9]+)" _ "${header_contents}")
set(VERSION ${CMAKE_MATCH_1})
string(REGEX MATCH "define *SDL_MIXER_MINOR_VERSION *([0-9]+)" _ "${header_contents}")
string(APPEND VERSION ".${CMAKE_MATCH_1}")
string(REGEX MATCH "define *SDL_MIXER_PATCHLEVEL *([0-9]+)" _ "${header_contents}")
string(APPEND VERSION ".${CMAKE_MATCH_1}")
set(SDL_VERSION 0.0)
configure_file(SDL2_mixer.pc.in "${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer.pc" @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer.pc DESTINATION lib/pkgconfig)
if(NOT SDL_MIXER_SKIP_HEADERS)
install(FILES SDL_mixer.h DESTINATION include/SDL2)
endif()

1
ports/sdl2-mixer/portfile.cmake
View File

@ -51,6 +51,7 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup()
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

2
ports/sdl2-mixer/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "sdl2-mixer",
"version": "2.0.4",
"port-version": 13,
"port-version": 14,
"description": "Multi-channel audio mixer library for SDL.",
"homepage": "https://www.libsdl.org/projects/SDL_mixer",
"dependencies": [

20
ports/sdl2-ttf/CMakeLists.txt
View File

@ -23,6 +23,26 @@ INSTALL(EXPORT SDL2_ttf
NAMESPACE SDL2::
)
set(prefix "")
set(exec_prefix [[${prefix}]])
set(libdir [[${prefix}/lib]])
set(includedir [[${prefix}/include]])
set(PACKAGE "SDL2_ttf")
file(READ "SDL_ttf.h" header_contents)
# #define SDL_TTF_MAJOR_VERSION 2
# #define SDL_TTF_MINOR_VERSION 0
# #define SDL_TTF_PATCHLEVEL 5
string(REGEX MATCH "define *SDL_TTF_MAJOR_VERSION *([0-9]+)" _ "${header_contents}")
set(VERSION ${CMAKE_MATCH_1})
string(REGEX MATCH "define *SDL_TTF_MINOR_VERSION *([0-9]+)" _ "${header_contents}")
string(APPEND VERSION ".${CMAKE_MATCH_1}")
string(REGEX MATCH "define *SDL_TTF_PATCHLEVEL *([0-9]+)" _ "${header_contents}")
string(APPEND VERSION ".${CMAKE_MATCH_1}")
set(SDL_VERSION 0.0)
configure_file(SDL2_ttf.pc.in "${CMAKE_CURRENT_BINARY_DIR}/SDL2_ttf.pc" @ONLY)
file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/SDL2_ttf.pc" "Requires.private: freetype2")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SDL2_ttf.pc DESTINATION lib/pkgconfig)
if(NOT DEFINED SDL_TTF_SKIP_HEADERS)
install(FILES SDL_ttf.h DESTINATION include/SDL2)
endif()

1
ports/sdl2-ttf/portfile.cmake
View File

@ -23,6 +23,7 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets()
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

2
ports/sdl2-ttf/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "sdl2-ttf",
"version-string": "2.0.15",
"port-version": 4,
"port-version": 5,
"description": "A library for rendering TrueType fonts with SDL",
"homepage": "https://www.libsdl.org/projects/SDL_ttf/",
"dependencies": [

29
ports/sdl2pp/portfile.cmake
View File

@ -7,29 +7,32 @@ vcpkg_from_github(
PATCHES fix-dependencies.patch
)
file(REMOVE ${SOURCE_PATH}/cmake/FindSDL2.cmake
${SOURCE_PATH}/cmake/FindSDL2_image.cmake
${SOURCE_PATH}/cmake/FindSDL2_mixer.cmake
${SOURCE_PATH}/cmake/FindSDL2_ttf.cmake
file(REMOVE "${SOURCE_PATH}/cmake/FindSDL2.cmake"
"${SOURCE_PATH}/cmake/FindSDL2_image.cmake"
"${SOURCE_PATH}/cmake/FindSDL2_mixer.cmake"
"${SOURCE_PATH}/cmake/FindSDL2_ttf.cmake"
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL2PP_STATIC)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DSDL2PP_WITH_EXAMPLES=OFF
-DSDL2PP_WITH_TESTS=OFF
-DSDL2PP_STATIC=${SDL2PP_STATIC}
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/cmake/Modules/FindSDL2PP.cmake" "HINTS \"${CURRENT_PACKAGES_DIR}/include\"" "")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/cmake/Modules/FindSDL2PP.cmake" "HINTS \"${CURRENT_PACKAGES_DIR}/lib\"" "")
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})
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)
file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

10
ports/sdl2pp/vcpkg.json
View File

@ -1,13 +1,17 @@
{
"name": "sdl2pp",
"version-string": "0.16.1",
"port-version": 1,
"version": "0.16.1",
"port-version": 2,
"description": "C++11 bindings/wrapper for SDL2",
"homepage": "https://sdl2pp.amdmi3.ru",
"dependencies": [
"sdl2",
"sdl2-image",
"sdl2-mixer",
"sdl2-ttf"
"sdl2-ttf",
{
"name": "vcpkg-cmake",
"host": true
}
]
}

8
versions/baseline.json
View File

@ -6182,11 +6182,11 @@
},
"sdl2-image": {
"baseline": "2.0.5",
"port-version": 2
"port-version": 3
},
"sdl2-mixer": {
"baseline": "2.0.4",
"port-version": 13
"port-version": 14
},
"sdl2-net": {
"baseline": "2.0.1",
@ -6194,11 +6194,11 @@
},
"sdl2-ttf": {
"baseline": "2.0.15",
"port-version": 4
"port-version": 5
},
"sdl2pp": {
"baseline": "0.16.1",
"port-version": 1
"port-version": 2
},
"seal": {
"baseline": "3.7.2",

5
versions/s-/sdl2-image.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7cd6ce4e9108671f3f4bad86c37ee2586acbf440",
"version-string": "2.0.5",
"port-version": 3
},
{
"git-tree": "8b1c139f382edc4b0e9e1e3ba7ecd25667583f36",
"version-string": "2.0.5",

5
versions/s-/sdl2-mixer.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "960ae8e64dfba885f0fa2274277e2b929aaf0ded",
"version": "2.0.4",
"port-version": 14
},
{
"git-tree": "6338ed4f079dda0759ac18a4dcc5f04448e56cc3",
"version": "2.0.4",

5
versions/s-/sdl2-ttf.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cefc95479a9fa2c8a8c4f5539952978f77e3de99",
"version-string": "2.0.15",
"port-version": 5
},
{
"git-tree": "888938a2d639aaa04b3e79d2ea451a87b616541c",
"version-string": "2.0.15",

5
versions/s-/sdl2pp.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "99074ba7a6f080e0b9c74dde8254875c95c7d9ea",
"version": "0.16.1",
"port-version": 2
},
{
"git-tree": "f63085c248f23dcc4acdf7d77c8ecab83387f45d",
"version-string": "0.16.1",