Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[libsystemd] Fix build when specifying release-only build (#35737)

This commit is contained in:
Vitalii Koshura 2023-12-19 00:25:01 +03:00 committed by GitHub
parent fafa83c8bf
commit ecdff26160
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ports/libsystemd/portfile.cmake
View File

@ -41,15 +41,19 @@ else()
file(INSTALL "${BUILD_DIR_RELEASE}/libsystemd.so" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" FOLLOW_SYMLINK_CHAIN)
endif()
set(BUILD_DIR_DEBUG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(INSTALL "${BUILD_DIR_DEBUG}/libsystemd.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
else()
file(INSTALL "${BUILD_DIR_DEBUG}/libsystemd.so" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" FOLLOW_SYMLINK_CHAIN)
if(NOT VCPKG_BUILD_TYPE)
set(BUILD_DIR_DEBUG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(INSTALL "${BUILD_DIR_DEBUG}/libsystemd.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
else()
file(INSTALL "${BUILD_DIR_DEBUG}/libsystemd.so" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" FOLLOW_SYMLINK_CHAIN)
endif()
endif()
file(INSTALL "${BUILD_DIR_RELEASE}/src/libsystemd/libsystemd.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
file(INSTALL "${BUILD_DIR_DEBUG}/src/libsystemd/libsystemd.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
if(NOT VCPKG_BUILD_TYPE)
file(INSTALL "${BUILD_DIR_DEBUG}/src/libsystemd/libsystemd.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
endif()
vcpkg_fixup_pkgconfig()

2
ports/libsystemd/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "libsystemd",
"version": "254",
"port-version": 1,
"port-version": 2,
"description": "Libsystemd",
"homepage": "https://github.com/systemd/systemd",
"license": "LGPL-2.1+",

2
versions/baseline.json
View File

@ -4882,7 +4882,7 @@
},
"libsystemd": {
"baseline": "254",
"port-version": 1
"port-version": 2
},
"libtar": {
"baseline": "1.2.20",

5
versions/l-/libsystemd.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5213227454790bf5e953a66d807e04059742381e",
"version": "254",
"port-version": 2
},
{
"git-tree": "2ac525bd287e8a58992f263adce78483b0513cb0",
"version": "254",