mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-12 17:20:13 +00:00
Code Issues Projects Releases Wiki Activity

freerdp: provide cmake integration

Browse Source 
Do not delete the cmake config and target files to allow easy
integration with cmake based libraries/applications.

Signed-off-by: Andreas Cord-Landwehr <cordlandwehr@kde.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Andreas Cord-Landwehr
2024-01-17 20:21:32 +01:00
committed by Khem Raj
parent 982b0f17ce
commit 9035d01414
2 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/freerdp/freerdp/0002-Do-not-install-tools-a-CMake-targets.patch
+45
View File
@@ -0,0 +1,45 @@
From 0ddaeae351295e48365657482f165652051bbca2 Mon Sep 17 00:00:00 2001
From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
Date: Wed, 17 Jan 2024 20:00:58 +0100
Subject: [PATCH] Do not install tools a CMake targets
The cli tools are installed manually and thus are missing in the sysroot
folder. Do not export their targets because they do not exist and make
CMake fail when searching for the library.
Upstream-Status: Inappropriate
Signed-off-by: Andreas Cord-Landwehr <cordlandwehr@kde.org>
---
winpr/tools/hash-cli/CMakeLists.txt | 2 +-
winpr/tools/makecert-cli/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/winpr/tools/hash-cli/CMakeLists.txt b/winpr/tools/hash-cli/CMakeLists.txt
index 9f8c7a8a0..b6d048fec 100644
--- a/winpr/tools/hash-cli/CMakeLists.txt
+++ b/winpr/tools/hash-cli/CMakeLists.txt
@@ -43,7 +43,7 @@ set(${MODULE_PREFIX}_LIBS winpr)
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools EXPORT WinPRTargets)
+install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools)
if (WITH_DEBUG_SYMBOLS AND MSVC)
install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
diff --git a/winpr/tools/makecert-cli/CMakeLists.txt b/winpr/tools/makecert-cli/CMakeLists.txt
index 48fda5b5e..c7cf4bfaf 100644
--- a/winpr/tools/makecert-cli/CMakeLists.txt
+++ b/winpr/tools/makecert-cli/CMakeLists.txt
@@ -46,7 +46,7 @@ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} winpr)
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools")
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools EXPORT WinPRTargets)
+install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools)
if (WITH_DEBUG_SYMBOLS AND MSVC)
install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
endif()
--
2.40.1
meta-oe/recipes-support/freerdp/freerdp_2.11.2.bb
+1 -1
View File
@@ -17,6 +17,7 @@ SRCREV = "a38c1be9eee39a9bc22b511fffe96e63fdf8ebe7"
SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \
file://winpr-makecert-Build-with-install-RPATH.patch \ file://winpr-makecert-Build-with-install-RPATH.patch \
file://0001-Fix-const-qualifier-error.patch \ file://0001-Fix-const-qualifier-error.patch \
file://0002-Do-not-install-tools-a-CMake-targets.patch \
" "
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
@@ -63,7 +64,6 @@ do_configure:append() {
do_install:append () { do_install:append () {
install -d ${D}${bindir} install -d ${D}${bindir}
install -m755 winpr/tools/makecert-cli/winpr-makecert ${D}${bindir} install -m755 winpr/tools/makecert-cli/winpr-makecert ${D}${bindir}
rm -rf ${D}${libdir}/cmake
rm -rf ${D}${libdir}/freerdp rm -rf ${D}${libdir}/freerdp
} }