mirror of https://github.com/microsoft/vcpkg.git
[ecm] update version to 6.4.0 and fix absolute paths (#40295)
Co-authored-by: Jon <v-zhli17@microsoft.com>
This commit is contained in:
JonLiu1993
GitHub
parent
16601c6e7e
commit
bccb06637e
|
|
@ -1,39 +0,0 @@
|
|||
From 203c65c562453385e3ffc4485844b15e80b93107 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
|
||||
Date: Fri, 17 Sep 2021 00:07:08 +0200
|
||||
Subject: [PATCH] FindCanberra: link against target provided by pkgconfig
|
||||
|
||||
target_link_libraries() against the target generated by
|
||||
pkg_check_modules() so that the additional linker options are not
|
||||
lost, such as the additional libraries to link against when
|
||||
building statically.
|
||||
|
||||
BUG: 442555
|
||||
---
|
||||
find-modules/FindCanberra.cmake | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/find-modules/FindCanberra.cmake b/find-modules/FindCanberra.cmake
|
||||
index c54adf99..f9561118 100644
|
||||
--- a/find-modules/FindCanberra.cmake
|
||||
+++ b/find-modules/FindCanberra.cmake
|
||||
@@ -34,7 +34,7 @@ Since 5.56.0.
|
||||
#]=======================================================================]
|
||||
|
||||
find_package(PkgConfig QUIET)
|
||||
-pkg_check_modules(PC_Canberra libcanberra QUIET)
|
||||
+pkg_check_modules(PC_Canberra IMPORTED_TARGET libcanberra QUIET)
|
||||
|
||||
find_library(Canberra_LIBRARIES
|
||||
NAMES canberra
|
||||
@@ -66,6 +66,7 @@ if(Canberra_FOUND AND NOT TARGET Canberra::Canberra)
|
||||
INTERFACE_COMPILE_OPTIONS "${PC_Canberra_CFLAGS}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${Canberra_INCLUDE_DIRS}"
|
||||
)
|
||||
+ target_link_libraries(Canberra::Canberra INTERFACE PkgConfig::PC_Canberra)
|
||||
endif()
|
||||
|
||||
mark_as_advanced(Canberra_LIBRARIES Canberra_INCLUDE_DIRS Canberra_VERSION)
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
diff --git a/find-modules/FindLibMount.cmake b/find-modules/FindLibMount.cmake
|
||||
index 3fcde4c5435a79c61c53bbd27e1932441a056d98..1f53f0218faa82fdf9713ab768080ab7c1d72b4a 100644
|
||||
--- a/find-modules/FindLibMount.cmake
|
||||
+++ b/find-modules/FindLibMount.cmake
|
||||
@@ -30,7 +30,7 @@ Since 5.83.0
|
||||
#]=======================================================================]
|
||||
|
||||
find_package(PkgConfig QUIET)
|
||||
-pkg_check_modules(PC_LIBMOUNT QUIET mount)
|
||||
+pkg_check_modules(PC_LIBMOUNT QUIET IMPORTED_TARGET mount)
|
||||
|
||||
find_path(LibMount_INCLUDE_DIRS NAMES libmount/libmount.h HINTS ${PC_LIBMOUNT_INCLUDE_DIRS})
|
||||
find_library(LibMount_LIBRARIES NAMES mount HINTS ${PC_LIBMOUNT_LIBRARY_DIRS})
|
||||
@@ -62,6 +62,9 @@ if(LibMount_FOUND AND NOT TARGET LibMount::LibMount)
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${LibMount_INCLUDE_DIRS}"
|
||||
INTERFACE_COMPILE_DEFINITIONS "${PC_LIBMOUNT_CFLAGS_OTHER}"
|
||||
)
|
||||
+ if (TARGET PkgConfig::PC_LIBMOUNT)
|
||||
+ target_link_libraries(LibMount::LibMount INTERFACE PkgConfig::PC_LIBMOUNT)
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
include(FeatureSummary)
|
||||
|
|
@ -1,12 +1,10 @@
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO KDE/extra-cmake-modules
|
||||
REF v5.98.0
|
||||
SHA512 355bf2010dd4c736981d0f708ab7245c0925104e19da01acee0482494f815088e5d7aed9aa968251f13c2c5b8cbfd67dc8bb147dec46050fea0881c00f456d9d
|
||||
REF "v${VERSION}"
|
||||
SHA512 30f9e4d606f88c8d0e2be8f0fbba47ae25cf6e1c9716d50fc2f7845e5527d6cb4a34dfca8ec4356e8e74ce936ae252edf833b2bc545a4c85a894103dd27d8c89
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix_canberra.patch # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/187
|
||||
fix_libmount.patch # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/200
|
||||
fix_generateqmltypes.patch # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/201
|
||||
)
|
||||
|
||||
|
|
@ -21,13 +19,14 @@ vcpkg_cmake_configure(
|
|||
|
||||
vcpkg_cmake_install()
|
||||
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH share/ECM/cmake)
|
||||
|
||||
# Remove debug files
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
|
||||
|
||||
file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||
# Handle copyright
|
||||
file(INSTALL "${SOURCE_PATH}/COPYING-CMAKE-SCRIPTS" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING-CMAKE-SCRIPTS")
|
||||
|
||||
# Allow empty include directory
|
||||
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
The package ecm provides CMake targets:
|
||||
ecm provides CMake files:
|
||||
|
||||
find_package(ECM CONFIG REQUIRED NO_MODULE)
|
||||
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
|
||||
list(INSERT CMAKE_MODULE_PATH 0 ${ECM_MODULE_PATH})
|
||||
include(KDEInstallDirs)
|
||||
include(KDECompilerSettings)
|
||||
include(KDECMakeSettings)
|
||||
|
|
|
|||
|
|
@ -1,12 +1,16 @@
|
|||
{
|
||||
"name": "ecm",
|
||||
"version": "5.98.0",
|
||||
"version": "6.4.0",
|
||||
"description": "Extra CMake Modules (ECM), extra modules and scripts for CMake",
|
||||
"homepage": "https://github.com/KDE/extra-cmake-modules",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2469,7 +2469,7 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"ecm": {
|
||||
"baseline": "5.98.0",
|
||||
"baseline": "6.4.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"ecos": {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "106274dc3cc918d9af50f69fd273e248c7fd352e",
|
||||
"version": "6.4.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "b23a9acfc30e1fb1cd894d5fea25665a1f8fb145",
|
||||
"version": "5.98.0",
|
||||
|
|
|
|||
Loading…
Reference in New Issue