mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 06:23:57 +08:00
698ffe5d25
* [kf5solid] require bison >= 3.0
* [kf5solid] fix CMake config file
* [kf5solid] some apps actually use solid-hardware5
diff --git a/ports/kf5solid/portfile.cmake b/ports/kf5solid/portfile.cmake
index b876b00c0..53cf1841b 100644
--- a/ports/kf5solid/portfile.cmake
+++ b/ports/kf5solid/portfile.cmake
@@ -44,6 +44,11 @@ vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Solid)
vcpkg_copy_pdbs()
+vcpkg_copy_tools(
+ TOOL_NAMES solid-hardware5
+ AUTO_CLEAN
+ )
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
@@ -51,9 +56,6 @@ endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-# solid-hardware and solid-power are a non-dev tools allowing to list hardware and power managament status of one's system. No need to keep them.
-file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/solid-hardware5${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/bin/solid-hardware5${VCPKG_HOST_EXECUTABLE_SUFFIX}")
-file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/solid-power${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/bin/solid-power${VCPKG_HOST_EXECUTABLE_SUFFIX}")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/qml" "${CURRENT_PACKAGES_DIR}/debug/qml")
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/qml" "${CURRENT_PACKAGES_DIR}/qml")
* [kf5solid] /etc is empty, no need to remove it
* [kf5solid] add PACKAGE_NAME to vcpkg_cmake_config_fixup
* [kf5solid] update versions
37 lines
1.0 KiB
Diff
37 lines
1.0 KiB
Diff
From c1e261d57383533a008f0c02689dd0292d4dc75a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
|
|
Date: Tue, 31 Aug 2021 02:18:42 +0200
|
|
Subject: [PATCH] Add support for static builds
|
|
|
|
---
|
|
KF5SolidConfig.cmake.in | 13 +++++++++++++
|
|
1 file changed, 13 insertions(+)
|
|
|
|
diff --git a/KF5SolidConfig.cmake.in b/KF5SolidConfig.cmake.in
|
|
index b597b3a..0a23f44 100644
|
|
--- a/KF5SolidConfig.cmake.in
|
|
+++ b/KF5SolidConfig.cmake.in
|
|
@@ -19,6 +19,19 @@ set(SOLID_DBUS_INTERFACES_DIR "@PACKAGE_KDE_INSTALL_DBUSINTERFACEDIR@")
|
|
include(CMakeFindDependencyMacro)
|
|
find_dependency(Qt5Core @REQUIRED_QT_VERSION@)
|
|
|
|
+if (NOT @BUILD_SHARED_LIBS@)
|
|
+ find_dependency(Qt5Xml @REQUIRED_QT_VERSION@)
|
|
+ find_dependency(Qt5Gui @REQUIRED_QT_VERSION@)
|
|
+
|
|
+ if (@Qt5DBus_FOUND@)
|
|
+ find_dependency(Qt5DBus @REQUIRED_QT_VERSION@)
|
|
+ endif()
|
|
+
|
|
+ if (@UDev_FOUND@)
|
|
+ find_dependency(UDev)
|
|
+ endif()
|
|
+endif()
|
|
+
|
|
include("${CMAKE_CURRENT_LIST_DIR}/KF5SolidTargets.cmake")
|
|
@PACKAGE_INCLUDE_QCHTARGETS@
|
|
|
|
--
|
|
GitLab
|
|
|