This commit is contained in:
JonLiu1993 2023-07-14 16:21:37 -07:00 коммит произвёл GitHub
Родитель ca4640a202
Коммит bffafa8f7a
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
6 изменённых файлов: 47 добавлений и 29 удалений

Просмотреть файл

@ -0,0 +1,31 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea4b2d2..f622d45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,7 +32,10 @@ install(FILES
)
install(TARGETS lunasvg
- LIBRARY DESTINATION ${LUNASVG_LIBDIR}
- ARCHIVE DESTINATION ${LUNASVG_LIBDIR}
- INCLUDES DESTINATION ${LUNASVG_INCDIR}
-)
+ EXPORT unofficial-lunasvg-config
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+ PUBLIC_HEADER DESTINATION include)
+
+install(EXPORT unofficial-lunasvg-config NAMESPACE unofficial::lunasvg:: DESTINATION share/unofficial-lunasvg)
\ No newline at end of file
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index de58954..74149dc 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -1,4 +1,5 @@
target_include_directories(lunasvg
PUBLIC
- "${CMAKE_CURRENT_LIST_DIR}"
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
+ $<INSTALL_INTERFACE:include>
)

Просмотреть файл

@ -1,26 +0,0 @@
CMakeLists.txt | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9916c67..159f3a6 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,16 +24,5 @@ if(LUNASVG_BUILD_EXAMPLES)
add_subdirectory(example)
endif()
-set(LUNASVG_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib)
-set(LUNASVG_INCDIR ${CMAKE_INSTALL_PREFIX}/include)
-
-install(FILES
- include/lunasvg.h
- DESTINATION ${LUNASVG_INCDIR}
-)
-
-install(TARGETS lunasvg
- LIBRARY DESTINATION ${LUNASVG_LIBDIR}
- ARCHIVE DESTINATION ${LUNASVG_LIBDIR}
- INCLUDES DESTINATION ${LUNASVG_INCDIR}
-)
+set_target_properties(lunasvg PROPERTIES PUBLIC_HEADER "include/lunasvg.h")
+install(TARGETS lunasvg RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include)

Просмотреть файл

@ -5,7 +5,7 @@ vcpkg_from_github(
SHA512 368f76ae3c04fbcb08406d9e7793af37b5e28ab90ffe0978fae8783620a45af3270fcd4e895c553e3e651f0ba07e37355acffd9f0aab1bf9ef822f465de21073
HEAD_REF master
PATCHES
fix-install.patch
fix-cmake.patch
)
vcpkg_cmake_configure(
@ -17,8 +17,10 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-lunasvg)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

Просмотреть файл

@ -1,6 +1,7 @@
{
"name": "lunasvg",
"version": "2.3.8",
"port-version": 1,
"description": "lunasvg is a standalone SVG rendering library in C++",
"homepage": "https://github.com/sammycage/lunasvg",
"license": "MIT",

Просмотреть файл

@ -5082,7 +5082,7 @@
},
"lunasvg": {
"baseline": "2.3.8",
"port-version": 0
"port-version": 1
},
"luv": {
"baseline": "1.44.2",

Просмотреть файл

@ -1,9 +1,19 @@
{
"versions": [
{
"git-tree": "27a82fac0168f7e17be4e9b8981833ed381197dc",
"version": "2.3.8",
"port-version": 1
},
{
"git-tree": "064296e0fbadcd3113e5ee2a65202614c9125acc",
"version": "2.3.8",
"port-version": 0
},
{
"git-tree": "bf20380ca537151f7d1e02a6ca5b19c302db18c7",
"version": "2.3.1",
"port-version": 0
}
]
}