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

Merge pull request #15593 from AndrewMeadows/linux-uses-qt-5.10

Browse source 
obey QT_CMAKE_PREFIX_PATH for non DEV_BUILD on UNIX
This commit is contained in:
Shannon Romano 2019-05-21 08:04:49 -07:00 committed by GitHub
commit b878e40606
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cmake/macros/SetupQt.cmake
View file

@ -51,18 +51,23 @@ macro(setup_qt)
if(NOT DEFINED VCPKG_QT_CMAKE_PREFIX_PATH) if(NOT DEFINED VCPKG_QT_CMAKE_PREFIX_PATH)
message(FATAL_ERROR "VCPKG_QT_CMAKE_PREFIX_PATH should have been set by hifi_vcpkg.py") message(FATAL_ERROR "VCPKG_QT_CMAKE_PREFIX_PATH should have been set by hifi_vcpkg.py")
endif() endif()
if (NOT DEFINED ENV{QT_CMAKE_PREFIX_PATH} OR NOT DEV_BUILD) if (NOT DEV_BUILD)
# HACK we ignore QT_CMAKE_PREFIX_PATH for PRODUCTION and PR builds if (APPLE)
# so we can punt updating the automated build OS images while switching to vcpkg for Qt # HACK: manually set the QT_CMAKE_PREFIX_PATH so that hard-coded paths find new QT libs where we'll put them
if (APPLE AND NOT DEV_BUILD)
# DOUBLE HACK for Jenkins + macos build: always store qt5 in /var/tmp/
# because that is where the manually-edited hard-coded path thinks it is
set(QT_CMAKE_PREFIX_PATH "/var/tmp/qt5-install/lib/cmake") set(QT_CMAKE_PREFIX_PATH "/var/tmp/qt5-install/lib/cmake")
elseif (UNIX AND DEFINED ENV{QT_CMAKE_PREFIX_PATH})
# HACK: obey QT_CMAKE_PREFIX_PATH to allow UNIX to use older QT libs
set(QT_CMAKE_PREFIX_PATH $ENV{QT_CMAKE_PREFIX_PATH})
else() else()
set(QT_CMAKE_PREFIX_PATH ${VCPKG_QT_CMAKE_PREFIX_PATH}) set(QT_CMAKE_PREFIX_PATH ${VCPKG_QT_CMAKE_PREFIX_PATH})
endif() endif()
else() else()
set(QT_CMAKE_PREFIX_PATH $ENV{QT_CMAKE_PREFIX_PATH}) # DEV_BUILD
if (DEFINED ENV{QT_CMAKE_PREFIX_PATH})
set(QT_CMAKE_PREFIX_PATH $ENV{QT_CMAKE_PREFIX_PATH})
else()
set(QT_CMAKE_PREFIX_PATH ${VCPKG_QT_CMAKE_PREFIX_PATH})
endif()
endif() endif()
# figure out where the qt dir is # figure out where the qt dir is