diff --git a/cmake/macros/SetupQt.cmake b/cmake/macros/SetupQt.cmake index 82e59cfb71..593fd31a5a 100644 --- a/cmake/macros/SetupQt.cmake +++ b/cmake/macros/SetupQt.cmake @@ -54,8 +54,10 @@ macro(setup_qt) if (NOT DEV_BUILD) if (UNIX AND DEFINED ENV{QT_CMAKE_PREFIX_PATH}) # 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() else() diff --git a/hifi_vcpkg.py b/hifi_vcpkg.py index 56e904b795..3ae3a926b5 100644 --- a/hifi_vcpkg.py +++ b/hifi_vcpkg.py @@ -215,10 +215,7 @@ endif() def getQt5InstallPath(self): qt5InstallPath = os.path.join(self.path, 'installed', 'qt5-install') - if os.getenv('HIFI_QT_INSTALL_ROOT'): - # Allow qt install path to be overriden by an environment variable - qt5InstallPath = os.getenv('HIFI_QT_INSTALL_ROOT') - elif self.args.android: + if self.args.android: precompiled = os.path.realpath(self.androidPackagePath) qt5InstallPath = os.path.realpath(os.path.join(precompiled, 'qt')) return qt5InstallPath