mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-07-01 22:25:26 +02:00
c91bff35b6
This commit adds a patch for QWindowKit to ensure that it always
installs its dependency QMSetup in a directory where CMake will be able
to find it. This makes the previous QWindowKit patch unnecessary and
fixes a build issue when packaging Jami on Debian and Ubuntu that
started occurring when QWindowKit was updated in commit 6b70ffc.
GitLab: #1976
Change-Id: I5f23fcbb612aa6d0eb0e77e9a5a006b24a5af082
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From 56830725e641705e0113a068ee58df7029202439 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fran=C3=A7ois-Simon=20Fauteux-Chapleau?=
|
|
<francois-simon.fauteux-chapleau@savoirfairelinux.com>
|
|
Date: Wed, 2 Apr 2025 20:54:02 -0400
|
|
Subject: [PATCH] fix qm_install_package function
|
|
|
|
---
|
|
cmake/modules/private/InstallPackage.cmake | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/qmsetup/cmake/modules/private/InstallPackage.cmake b/qmsetup/cmake/modules/private/InstallPackage.cmake
|
|
index 70174bc..f067de5 100644
|
|
--- a/qmsetup/cmake/modules/private/InstallPackage.cmake
|
|
+++ b/qmsetup/cmake/modules/private/InstallPackage.cmake
|
|
@@ -101,6 +101,7 @@ function(qm_install_package _name)
|
|
execute_process(
|
|
COMMAND ${CMAKE_COMMAND} -S ${_src_dir} -B ${_build_dir}
|
|
${_extra_args} ${_build_type}
|
|
+ "-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}"
|
|
"-DCMAKE_INSTALL_PREFIX=${_install_dir}" ${FUNC_CONFIGURE_ARGS}
|
|
OUTPUT_FILE ${_log_file}
|
|
ERROR_FILE ${_log_file}
|
|
@@ -150,4 +151,4 @@ function(qm_install_package _name)
|
|
if(FUNC_RESULT_PATH)
|
|
set(${FUNC_RESULT_PATH} ${_install_cmake_dir} PARENT_SCOPE)
|
|
endif()
|
|
-endfunction()
|
|
\ No newline at end of file
|
|
+endfunction()
|
|
--
|
|
2.34.1
|
|
|