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

Updated for Jenkins.

Browse source
This commit is contained in:
NissimHadar 2019-04-22 21:36:35 -07:00
parent dd85e224a4
commit 01a838b5cb
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cmake/macros/SetupQt.cmake
View file

@ -11,10 +11,18 @@ macro(setup_qt)
# if we are in a development build and QT_CMAKE_PREFIX_PATH is specified # if we are in a development build and QT_CMAKE_PREFIX_PATH is specified
# then use it, # then use it,
# otherwise, use the vcpkg'ed version # otherwise, use the vcpkg'ed version
if ((RELEASE_TYPE STREQUAL "DEV") AND DEFINED ENV{QT_CMAKE_PREFIX_PATH} ) if (RELEASE_TYPE STREQUAL "DEV")
set(QT_CMAKE_PREFIX_PATH $ENV{QT_CMAKE_PREFIX_PATH}) 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 () 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() endif()
# figure out where the qt dir is # figure out where the qt dir is