diff --git a/cmake/macros/SetupQt.cmake b/cmake/macros/SetupQt.cmake index d6f47e20da..fafed63e88 100644 --- a/cmake/macros/SetupQt.cmake +++ b/cmake/macros/SetupQt.cmake @@ -11,16 +11,8 @@ macro(setup_qt) # if we are in a development build and QT_CMAKE_PREFIX_PATH is specified # then use it, # otherwise, use the vcpkg'ed version - if (RELEASE_TYPE STREQUAL "DEV") - if (DEFINED ENV{QT_CMAKE_PREFIX_PATH} ) - set(QT_CMAKE_PREFIX_PATH $ENV{QT_CMAKE_PREFIX_PATH}) - endif() -### else () -### if (WIN32) -### set(QT_CMAKE_PREFIX_PATH "C:/Windows/TEMP/hifi/vcpkg/installed/qt5-install/lib/cmake") -### else () -### set(QT_CMAKE_PREFIX_PATH "/tmp/hifi/vcpkg/installed/qt5-install/lib/cmake") -### endif() + if (RELEASE_TYPE STREQUAL "DEV" AND DEFINED ENV{QT_CMAKE_PREFIX_PATH} ) + set(QT_CMAKE_PREFIX_PATH $ENV{QT_CMAKE_PREFIX_PATH}) endif() # figure out where the qt dir is diff --git a/hifi_vcpkg.py b/hifi_vcpkg.py index 89bb5734b7..e1d509b9df 100644 --- a/hifi_vcpkg.py +++ b/hifi_vcpkg.py @@ -240,8 +240,7 @@ endif() def installQt(self): - ### if not os.path.isdir(os.path.join(self.path, 'installed', 'qt5-install')): - if True or not os.path.isdir(os.path.join(self.path, 'installed', 'qt5-install')): + if not os.path.isdir(os.path.join(self.path, 'installed', 'qt5-install')): print ("Downloading Qt from AWS ") dest = os.path.join(self.path, 'installed') if platform.system() == 'Windows':