3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 11:21:12 +08:00
Code Issues Projects Releases Wiki Activity

[sail] fix include directory (#37916)

Browse Source
This commit is contained in:
JonLiu1993 2024-04-03 16:16:36 -07:00 committed by GitHub
parent 2308ec3771
commit dde88744e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 89 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
ports/sail/fix-include-directory.patch Normal file
View File

@ -0,0 +1,79 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac81279..cfc2f3b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -299,7 +299,7 @@ endif()
# Common configuration file
#
configure_file("${PROJECT_SOURCE_DIR}/src/config.h.in" "${PROJECT_BINARY_DIR}/include/sail-common/config.h" @ONLY)
-install(FILES "${PROJECT_BINARY_DIR}/include/sail-common/config.h" DESTINATION include/sail/sail-common)
+install(FILES "${PROJECT_BINARY_DIR}/include/sail-common/config.h" DESTINATION include/sail-common)
# Print configuration statistics
#
diff --git a/src/bindings/sail-c++/CMakeLists.txt b/src/bindings/sail-c++/CMakeLists.txt
index 4b69ad4..f4bac29 100644
--- a/src/bindings/sail-c++/CMakeLists.txt
+++ b/src/bindings/sail-c++/CMakeLists.txt
@@ -131,7 +131,7 @@ install(TARGETS sail-c++
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
- PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sail/sail-c++")
+ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sail-c++")
# Install development packages
#
diff --git a/src/sail-common/CMakeLists.txt b/src/sail-common/CMakeLists.txt
index 06ce246..c8576e5 100644
--- a/src/sail-common/CMakeLists.txt
+++ b/src/sail-common/CMakeLists.txt
@@ -114,7 +114,7 @@ endif()
target_include_directories(sail-common
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
- $<INSTALL_INTERFACE:include/sail>)
+ $<INSTALL_INTERFACE:include>)
# pkg-config integration
#
@@ -129,7 +129,7 @@ install(TARGETS sail-common
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
- PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sail/sail-common")
+ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sail-common")
# Install development packages
#
diff --git a/src/sail-manip/CMakeLists.txt b/src/sail-manip/CMakeLists.txt
index 5740764..47b81bb 100644
--- a/src/sail-manip/CMakeLists.txt
+++ b/src/sail-manip/CMakeLists.txt
@@ -59,7 +59,7 @@ install(TARGETS sail-manip
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
- PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sail/sail-manip")
+ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sail-manip")
# Install development packages
#
diff --git a/src/sail/CMakeLists.txt b/src/sail/CMakeLists.txt
index 85590af..2303f63 100644
--- a/src/sail/CMakeLists.txt
+++ b/src/sail/CMakeLists.txt
@@ -118,11 +118,11 @@ install(TARGETS sail
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
- PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sail/sail")
+ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sail")
# Install layouts for debugging codecs
#
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/layout/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sail/sail/layout")
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/layout/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sail/layout")
# Install development packages
#

4
ports/sail/portfile.cmake
View File

@ -4,6 +4,8 @@ vcpkg_from_github(
REF "v${VERSION}"
SHA512 c8cface60031c5e84b99eaedb216f9e3af0354d24f5db7d6d0ec1f97d593ae46cb13c86bc244b6b8673cddfecf829a8b7738fdde8620472c12e95a5b61495133
HEAD_REF master
PATCHES
fix-include-directory.patch
)
# Enable selected codecs
@ -56,7 +58,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake"
vcpkg_fixup_pkgconfig()
# Unused because SAIL_COMBINE_CODECS is ON
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sail/sail-common/config.h" "#define SAIL_CODECS_PATH \"${CURRENT_PACKAGES_DIR}/lib/sail/codecs\"" "")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sail-common/config.h" "#define SAIL_CODECS_PATH \"${CURRENT_PACKAGES_DIR}/lib/sail/codecs\"" "")
# Handle usage
file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

1
ports/sail/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "sail",
"version-semver": "0.9.1",
"port-version": 1,
"description": "The missing small and fast image decoding library for humans (not for machines)",
"homepage": "https://github.com/HappySeaFox/sail",
"license": "MIT",

2
versions/baseline.json
View File

@ -7810,7 +7810,7 @@
},
"sail": {
"baseline": "0.9.1",
"port-version": 0
"port-version": 1
},
"sajson": {
"baseline": "2018-09-21",

5
versions/s-/sail.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b5fe68901010efcf15a6025a105333d15bb284bf",
"version-semver": "0.9.1",
"port-version": 1
},
{
"git-tree": "6e673bf75a449ebb5474953cb8eaa69333fc08b4",
"version-semver": "0.9.1",