From da655c837e5a6ab46f79863bdd7b6397d3fc0d14 Mon Sep 17 00:00:00 2001 From: danteruiz Date: Thu, 19 Sep 2019 22:35:59 -0700 Subject: [PATCH] Do not download Qt if Qt_CMAKE_PREFIX_PATH as an environment variable --- hifi_vcpkg.py | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/hifi_vcpkg.py b/hifi_vcpkg.py index 821d9ae0b7..f726a87945 100644 --- a/hifi_vcpkg.py +++ b/hifi_vcpkg.py @@ -257,26 +257,27 @@ endif() def installQt(self): qt5InstallPath = self.getQt5InstallPath() - if not os.path.isdir(qt5InstallPath): - print ('Downloading Qt from AWS') - dest, tail = os.path.split(qt5InstallPath) + if os.getenv('QT_CMAKE_PREFIX_PATH') == None: + if not os.path.isdir(qt5InstallPath): + print ('Downloading Qt from AWS') + dest, tail = os.path.split(qt5InstallPath) - url = 'NOT DEFINED' - if platform.system() == 'Windows': - url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-windows3.tar.gz' - elif platform.system() == 'Darwin': - url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-macos3.tar.gz' - elif platform.system() == 'Linux': - if platform.linux_distribution()[1][:3] == '16.': - url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-16.04-with-symbols.tar.gz' - elif platform.linux_distribution()[1][:3] == '18.': - url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-18.04.tar.gz' + url = 'NOT DEFINED' + if platform.system() == 'Windows': + url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-windows3.tar.gz' + elif platform.system() == 'Darwin': + url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-macos3.tar.gz' + elif platform.system() == 'Linux': + if platform.linux_distribution()[1][:3] == '16.': + url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-16.04-with-symbols.tar.gz' + elif platform.linux_distribution()[1][:3] == '18.': + url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-18.04.tar.gz' + else: + print('UNKNOWN LINUX VERSION!!!') else: - print('UNKNOWN LINUX VERSION!!!') - else: - print('UNKNOWN OPERATING SYSTEM!!!') + print('UNKNOWN OPERATING SYSTEM!!!') - print('Extracting ' + url + ' to ' + dest) - hifi_utils.downloadAndExtract(url, dest) - else: - print ('Qt has already been downloaded') + print('Extracting ' + url + ' to ' + dest) + hifi_utils.downloadAndExtract(url, dest) + else: + print ('Qt has already been downloaded')