From 01a838b5cb129913e89ff55e9c04b23e89bdcac5 Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Mon, 22 Apr 2019 21:36:35 -0700 Subject: [PATCH] Updated for Jenkins. --- cmake/macros/SetupQt.cmake | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/cmake/macros/SetupQt.cmake b/cmake/macros/SetupQt.cmake index 1a59a510f1..76b4ec098e 100644 --- a/cmake/macros/SetupQt.cmake +++ b/cmake/macros/SetupQt.cmake @@ -11,10 +11,18 @@ 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") AND DEFINED ENV{QT_CMAKE_PREFIX_PATH} ) - set(QT_CMAKE_PREFIX_PATH $ENV{QT_CMAKE_PREFIX_PATH}) + if (RELEASE_TYPE STREQUAL "DEV") + if (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() else () - set(QT_CMAKE_PREFIX_PATH $ENV{HIFI_VCPKG_BASE_VERSION} "/installed/qt5-install/lib/cmake") + 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() endif() # figure out where the qt dir is