diff --git a/CMakeLists.txt b/CMakeLists.txt index 6542295a9ce1364c43a56b3e4410847fb9d26ec5..e96fbf617fc8f3c859e12d12f8e480a48e8f3013 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 24ce1cc96b58133dd069e15ba47c1abd9d4a50f8..4a9abee958056e8f5e3ebdba518c9f9c66af42d2 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 = [