From c7442e3a62a64758806d24242da94f6e8874c313 Mon Sep 17 00:00:00 2001 From: Clement Date: Tue, 2 Jul 2019 13:24:48 -0700 Subject: [PATCH] Remove QT_CMAKE_PREFIX_PATH prod hack --- cmake/macros/SetupQt.cmake | 10 ++-------- hifi_vcpkg.py | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/cmake/macros/SetupQt.cmake b/cmake/macros/SetupQt.cmake index 3ef0f9cde8..c09c2b0f6b 100644 --- a/cmake/macros/SetupQt.cmake +++ b/cmake/macros/SetupQt.cmake @@ -52,14 +52,8 @@ macro(setup_qt) message(FATAL_ERROR "VCPKG_QT_CMAKE_PREFIX_PATH should have been set by hifi_vcpkg.py") endif() if (NOT DEV_BUILD) - if (UNIX AND DEFINED ENV{QT_CMAKE_PREFIX_PATH} AND NOT APPLE) - # HACK: obey QT_CMAKE_PREFIX_PATH to allow UNIX to use older QT libs - message("HACK: obey QT_CMAKE_PREFIX_PATH on UNIX") - set(QT_CMAKE_PREFIX_PATH $ENV{QT_CMAKE_PREFIX_PATH}) - else() - message("override QT_CMAKE_PREFIX_PATH with VCPKG_QT_CMAKE_PREFIX_PATH") - set(QT_CMAKE_PREFIX_PATH ${VCPKG_QT_CMAKE_PREFIX_PATH}) - endif() + message("override QT_CMAKE_PREFIX_PATH with VCPKG_QT_CMAKE_PREFIX_PATH") + set(QT_CMAKE_PREFIX_PATH ${VCPKG_QT_CMAKE_PREFIX_PATH}) else() # DEV_BUILD if (DEFINED ENV{QT_CMAKE_PREFIX_PATH}) diff --git a/hifi_vcpkg.py b/hifi_vcpkg.py index 686ccfcfc7..764a6270bd 100644 --- a/hifi_vcpkg.py +++ b/hifi_vcpkg.py @@ -259,7 +259,7 @@ endif() 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.tar.gz' + 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: