From 31581db7f5dacd0d94d9ab0b273d2336cbb2278f Mon Sep 17 00:00:00 2001 From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com> Date: Mon, 14 Apr 2025 17:05:01 -0400 Subject: [PATCH] misc: bump daemon Brings in some build fixes. Also prevents applying the qmsetup patch on Windows, and calls build-windows.py --init with the qt parameter which is required if when using Qt installed in a non-standard location. Change-Id: I40facbdc93289792130a15b0f4151f78137bc1ef --- CMakeLists.txt | 4 +++- build.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6542295a..e96fbf61 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,7 +98,9 @@ endif() # then call find_package again. Unfortunately, even the second call to find_package sometimes # fails due to qmsetup having been installed in the wrong directory. The following patch # ensures that qmsetup is always installed in the directory where find_package looks for it. -list(APPEND QWINDOWKIT_PATCHES ${EXTRA_PATCHES_DIR}/0001-fix-qm_install_package-function.patch) +if(NOT WIN32) + list(APPEND QWINDOWKIT_PATCHES ${EXTRA_PATCHES_DIR}/0001-fix-qm_install_package-function.patch) +endif() # qwindowkit (frameless window) add_fetch_content( diff --git a/build.py b/build.py index 24ce1cc9..4a9abee9 100755 --- a/build.py +++ b/build.py @@ -374,7 +374,7 @@ def run_install(args): # Prepare the build-windows.py script call build_windows = 'extras/scripts/build-windows.py' # Initialize build environment - execute_script([f'python {build_windows} --init']) + execute_script([f'python {build_windows} --init --qt={args.qt}']) # Construct build command with options build_cmd = [ -- GitLab