Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-05 17:07:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Review fixes

Browse source
This commit is contained in:
Dale Glass 2024-02-13 00:28:07 +01:00
parent 0e2131e80c
commit 2d2e07b693
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
hifi_qt.py
View file

@ -81,7 +81,9 @@ endif()
qt_found = True qt_found = True
system_qt = True system_qt = True
#print("Using system Qt")
if not self.args.quiet:
print("Using system Qt")
elif os.getenv('OVERTE_QT_PATH', "") != "": elif os.getenv('OVERTE_QT_PATH', "") != "":
# 2. Using an user-provided directory. # 2. Using an user-provided directory.
@ -92,7 +94,9 @@ endif()
self.cmakePath = os.path.join(self.fullPath, 'lib', 'cmake') self.cmakePath = os.path.join(self.fullPath, 'lib', 'cmake')
qt_found = True qt_found = True
#print("Using Qt from " + self.fullPath)
if not self.args.quiet:
print("Using Qt from " + self.fullPath)
else: else:
# 3. Using a pre-built Qt. # 3. Using a pre-built Qt.
@ -135,7 +139,8 @@ endif()
self.lockFile = os.path.join(lockDir, lockName) self.lockFile = os.path.join(lockDir, lockName)
if qt_found: if qt_found:
#print("Found pre-built Qt5") if not self.args.quiet:
print("Found pre-built Qt5")
return return
if 'Windows' == system: if 'Windows' == system:

3
hifi_vcpkg.py
View file

@ -71,7 +71,8 @@ endif()
os.makedirs(self.basePath) os.makedirs(self.basePath)
self.path = os.path.join(self.basePath, self.id) self.path = os.path.join(self.basePath, self.id)
#print("Using vcpkg path {}".format(self.path)) if not self.args.quiet:
print("Using vcpkg path {}".format(self.path))
lockDir, lockName = os.path.split(self.path) lockDir, lockName = os.path.split(self.path)
lockName += '.lock' lockName += '.lock'
if not os.path.isdir(lockDir): if not os.path.isdir(lockDir):

6
prebuild.py
View file

@ -85,6 +85,7 @@ def parse_args():
parser.add_argument('--ci-build', action='store_true', default=os.getenv('CI_BUILD') is not None) parser.add_argument('--ci-build', action='store_true', default=os.getenv('CI_BUILD') is not None)
parser.add_argument('--get-vcpkg-id', action='store_true', help='Get the VCPKG ID, the hash path of the full VCPKG path') parser.add_argument('--get-vcpkg-id', action='store_true', help='Get the VCPKG ID, the hash path of the full VCPKG path')
parser.add_argument('--get-vcpkg-path', action='store_true', help='Get the full VCPKG path, ID included.') parser.add_argument('--get-vcpkg-path', action='store_true', help='Get the full VCPKG path, ID included.')
parser.add_argument('--quiet', action='store_true', default=False, help='Quiet mode with less output')
if True: if True:
args = parser.parse_args() args = parser.parse_args()
@ -132,8 +133,9 @@ def main():
qt.writeConfig() qt.writeConfig()
else: else:
if (os.environ["OVERTE_USE_SYSTEM_QT"]): if (os.environ["OVERTE_USE_SYSTEM_QT"]):
#print("System Qt selected") if not args.quiet:
None print("System Qt selected")
else: else:
raise Exception("Internal error: System Qt not selected, but hifi_qt.py failed to return a cmake path") raise Exception("Internal error: System Qt not selected, but hifi_qt.py failed to return a cmake path")