From d7197dba650b5728098cc4c3425adb10c5ff15dd Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Mon, 22 Apr 2019 20:56:32 -0700 Subject: [PATCH] Use QT_CMAKE_PREFIX_PATH only on local builds. --- cmake/macros/SetupQt.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake/macros/SetupQt.cmake b/cmake/macros/SetupQt.cmake index c287b103c1..1a59a510f1 100644 --- a/cmake/macros/SetupQt.cmake +++ b/cmake/macros/SetupQt.cmake @@ -8,9 +8,12 @@ # Sets the QT_CMAKE_PREFIX_PATH and QT_DIR variables # Also enables CMAKE_AUTOMOC and CMAKE_AUTORCC macro(setup_qt) - # if QT_CMAKE_PREFIX_PATH was not specified before hand, - # try to use the environment variable - if (NOT DEFINED ENV{QT_CMAKE_PREFIX_PATH} ) + # 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") AND DEFINED ENV{QT_CMAKE_PREFIX_PATH} ) + set(QT_CMAKE_PREFIX_PATH $ENV{QT_CMAKE_PREFIX_PATH}) + else () set(QT_CMAKE_PREFIX_PATH $ENV{HIFI_VCPKG_BASE_VERSION} "/installed/qt5-install/lib/cmake") endif()