smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #710 from kiwix/no_qmake5_hardcoded

This commit is contained in:
Matthieu Gautier 2024-07-10 19:12:09 +02:00 committed by GitHub
parent cba77fdca6 c7bd6182e0
commit 02b0ae677c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kiwixbuild/buildenv.py
View File

@ -32,7 +32,9 @@ class NeutralEnv:
self.git_command = self._detect_command("git") self.git_command = self._detect_command("git")
self.make_command = self._detect_command("make") self.make_command = self._detect_command("make")
self.cmake_command = self._detect_command("cmake") self.cmake_command = self._detect_command("cmake")
self.qmake_command = self._detect_command("qmake", required=False) self.qmake_command = self._detect_command(
"qmake", required=False, default=[["qmake"], ["qmake-qt5"]]
)
def detect_platform(self): def detect_platform(self):
_platform = platform.system() _platform = platform.system()

2
kiwixbuild/dependencies/base.py
View File

@ -502,7 +502,7 @@ class QMakeBuilder(MakeBuilder):
def _configure(self, context): def _configure(self, context):
context.try_skip(self.build_path) context.try_skip(self.build_path)
command = [ command = [
"qmake", *neutralEnv("qmake_command"),
*self.configure_options, *self.configure_options,
*self.env_options, *self.env_options,
self.source_path, self.source_path,