Skip to content
Snippets Groups Projects
Commit 31581db7 authored by Andreas Traczyk's avatar Andreas Traczyk
Browse files

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
parent c323dcfe
No related branches found
No related tags found
No related merge requests found
...@@ -98,7 +98,9 @@ endif() ...@@ -98,7 +98,9 @@ endif()
# then call find_package again. Unfortunately, even the second call to find_package sometimes # 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 # 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. # ensures that qmsetup is always installed in the directory where find_package looks for it.
if(NOT WIN32)
list(APPEND QWINDOWKIT_PATCHES ${EXTRA_PATCHES_DIR}/0001-fix-qm_install_package-function.patch) list(APPEND QWINDOWKIT_PATCHES ${EXTRA_PATCHES_DIR}/0001-fix-qm_install_package-function.patch)
endif()
# qwindowkit (frameless window) # qwindowkit (frameless window)
add_fetch_content( add_fetch_content(
......
...@@ -374,7 +374,7 @@ def run_install(args): ...@@ -374,7 +374,7 @@ def run_install(args):
# Prepare the build-windows.py script call # Prepare the build-windows.py script call
build_windows = 'extras/scripts/build-windows.py' build_windows = 'extras/scripts/build-windows.py'
# Initialize build environment # 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 # Construct build command with options
build_cmd = [ build_cmd = [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment