mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-05-06 04:46:42 +02:00
54 lines
2.0 KiB
Diff
54 lines
2.0 KiB
Diff
Patch-Source: https://github.com/uael/sv/pull/61
|
|
--
|
|
From 9dc765e050abb89ffb05d2e8ae22bf753b84fad1 Mon Sep 17 00:00:00 2001
|
|
From: qaqland <anguoli@uniontech.com>
|
|
Date: Mon, 6 Apr 2026 11:36:38 +0800
|
|
Subject: [PATCH 1/2] correct public header installation path in cmake
|
|
|
|
Install public headers directly to CMAKE_INSTALL_INCLUDEDIR to be
|
|
consistent with other build tools (xmake, autotools).
|
|
---
|
|
CMakeLists.txt | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 0caee5d..a94feb6 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -205,7 +205,7 @@ endblock()
|
|
install(TARGETS ${PROJECT_NAME}
|
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
- PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
|
|
+ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
|
if (EXISTS ${${PROJECT_NAME}_INCLUDE_DIR}/${PROJECT_NAME}.h)
|
|
install(FILES ${${PROJECT_NAME}_INCLUDE_DIR}/${PROJECT_NAME}.h
|
|
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
|
|
|
From 8b1a9e82db80c028263b89881551ca6e6e77e68f Mon Sep 17 00:00:00 2001
|
|
From: qaqland <anguoli@uniontech.com>
|
|
Date: Mon, 6 Apr 2026 11:45:34 +0800
|
|
Subject: [PATCH 2/2] remove redundant sv.h installation check in cmake
|
|
|
|
There is no sv.h header file in the project (only semver.h exists),
|
|
so drop this conditional installation block.
|
|
---
|
|
CMakeLists.txt | 4 ----
|
|
1 file changed, 4 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index a94feb6..b118599 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -206,10 +206,6 @@ install(TARGETS ${PROJECT_NAME}
|
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
|
-if (EXISTS ${${PROJECT_NAME}_INCLUDE_DIR}/${PROJECT_NAME}.h)
|
|
- install(FILES ${${PROJECT_NAME}_INCLUDE_DIR}/${PROJECT_NAME}.h
|
|
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
|
-endif ()
|
|
|
|
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME}_SUMMARY")
|
|
set(CPACK_PACKAGE_VENDOR "${PROJECT_NAME}_VENDOR")
|