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

Added cmake messages to help debug config issues

Browse source 
Also remove uncessary HIFI_QT_INSTALL_ROOT env varaible from hifi_vcpkg.py
This commit is contained in:
Anthony Thibault 2019-05-30 09:22:53 -07:00
parent ddf1543d68
commit 5c982855ab
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/macros/SetupQt.cmake
View file

@ -54,8 +54,10 @@ macro(setup_qt)
if (NOT DEV_BUILD) if (NOT DEV_BUILD)
if (UNIX AND DEFINED ENV{QT_CMAKE_PREFIX_PATH}) if (UNIX AND DEFINED ENV{QT_CMAKE_PREFIX_PATH})
# HACK: obey QT_CMAKE_PREFIX_PATH to allow UNIX to use older QT libs # 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}) set(QT_CMAKE_PREFIX_PATH $ENV{QT_CMAKE_PREFIX_PATH})
else() else()
message("override QT_CMAKE_PREFIX_PATH with VCPKG_QT_CMAKE_PREFIX_PATH")
set(QT_CMAKE_PREFIX_PATH ${VCPKG_QT_CMAKE_PREFIX_PATH}) set(QT_CMAKE_PREFIX_PATH ${VCPKG_QT_CMAKE_PREFIX_PATH})
endif() endif()
else() else()

5
hifi_vcpkg.py
View file

@ -215,10 +215,7 @@ endif()
def getQt5InstallPath(self): def getQt5InstallPath(self):
qt5InstallPath = os.path.join(self.path, 'installed', 'qt5-install') qt5InstallPath = os.path.join(self.path, 'installed', 'qt5-install')
if os.getenv('HIFI_QT_INSTALL_ROOT'): if self.args.android:
# Allow qt install path to be overriden by an environment variable
qt5InstallPath = os.getenv('HIFI_QT_INSTALL_ROOT')
elif self.args.android:
precompiled = os.path.realpath(self.androidPackagePath) precompiled = os.path.realpath(self.androidPackagePath)
qt5InstallPath = os.path.realpath(os.path.join(precompiled, 'qt')) qt5InstallPath = os.path.realpath(os.path.join(precompiled, 'qt'))
return qt5InstallPath return qt5InstallPath