mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 02:33:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg baseline][kf5solid] Fix usage (#21344)

Browse Source 
* [vcpkg baseline][kf5solid] Fix usage

* version

* change to version

* version

* Apply suggestion

* version

* Apply suggestion

* version
This commit is contained in:
Jack·Boos·Yu 2021-11-16 08:51:11 +08:00 committed by GitHub
parent 197a7907e6
commit a7ad120c8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ports/kf5solid/fix-libmount.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/KF5SolidConfig.cmake.in b/KF5SolidConfig.cmake.in
index 0a23f44..7020804 100644
--- a/KF5SolidConfig.cmake.in
+++ b/KF5SolidConfig.cmake.in
@@ -23,6 +23,10 @@ if (NOT @BUILD_SHARED_LIBS@)
find_dependency(Qt5Xml @REQUIRED_QT_VERSION@)
find_dependency(Qt5Gui @REQUIRED_QT_VERSION@)
+ if (@HAVE_LIBMOUNT@)
+ find_dependency(LibMount)
+ endif()
+
if (@Qt5DBus_FOUND@)
find_dependency(Qt5DBus @REQUIRED_QT_VERSION@)
endif()

4
ports/kf5solid/portfile.cmake
View File

@ -6,6 +6,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
fix_config_cmake.patch # https://invent.kde.org/frameworks/solid/-/merge_requests/53
fix-libmount.patch
)
if(VCPKG_TARGET_IS_OSX)
@ -38,8 +39,9 @@ file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: fals
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
OPTIONS
-DBUILD_TESTING=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_LibMount=ON
)
vcpkg_cmake_install()

4
ports/kf5solid/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "kf5solid",
"version-semver": "5.84.0",
"port-version": 2,
"version": "5.84.0",
"port-version": 3,
"description": "Desktop hardware abstraction",
"homepage": "https://api.kde.org/frameworks/solid/html/index.html",
"dependencies": [

2
versions/baseline.json
View File

@ -3138,7 +3138,7 @@
},
"kf5solid": {
"baseline": "5.84.0",
"port-version": 2
"port-version": 3
},
"kf5sonnet": {
"baseline": "5.84.0",

5
versions/k-/kf5solid.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "77af969f1b19c937d7f41651b657a774cd3802c7",
"version": "5.84.0",
"port-version": 3
},
{
"git-tree": "f0a82387f00cd2a61e6f1751bb1c94c9d706fddb",
"version-semver": "5.84.0",