Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-06 17:53:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor cleanup.

Browse source
This commit is contained in:
NissimHadar 2019-04-23 15:06:40 -07:00
parent 68f9b473a6
commit f4b1aedbae
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmake/macros/SetupQt.cmake
View file

@ -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

3
hifi_vcpkg.py
View file

@ -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':