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

Fix environment variable cmake syntax

Browse source
This commit is contained in:
Dale Glass 2021-02-16 12:46:30 +01:00
parent ca489bd420
commit 758ebd7f9d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -102,7 +102,7 @@ include("${CMAKE_BINARY_DIR}/vcpkg.cmake")
if (HIFI_ANDROID) if (HIFI_ANDROID)
set(QT_CMAKE_PREFIX_PATH "$ENV{HIFI_ANDROID_PRECOMPILED}/qt/lib/cmake") set(QT_CMAKE_PREFIX_PATH "$ENV{HIFI_ANDROID_PRECOMPILED}/qt/lib/cmake")
else() else()
if (NOT $ENV{VIRCADIA_USE_SYSTEM_QT}) if (NOT DEFINED ENV{VIRCADIA_USE_SYSTEM_QT})
if(NOT EXISTS "${CMAKE_BINARY_DIR}/qt.cmake") if(NOT EXISTS "${CMAKE_BINARY_DIR}/qt.cmake")
message(FATAL_ERROR "qt configuration missing.") message(FATAL_ERROR "qt configuration missing.")
endif() endif()
@ -293,7 +293,7 @@ set_packaging_parameters()
# Locate the required Qt build on the filesystem # Locate the required Qt build on the filesystem
setup_qt() setup_qt()
if (NOT $ENV{VIRCADIA_USE_SYSTEM_QT}) if (NOT DEFINED ENV{VIRCADIA_USE_SYSTEM_QT})
list(APPEND CMAKE_PREFIX_PATH "${QT_CMAKE_PREFIX_PATH}") list(APPEND CMAKE_PREFIX_PATH "${QT_CMAKE_PREFIX_PATH}")
endif() endif()

2
interface/CMakeLists.txt
View file

@ -435,7 +435,7 @@ else()
endif() endif()
endif() endif()
if (NOT $ENV{VIRCADIA_USE_SYSTEM_QT}) if (NOT DEFINED ENV{VIRCADIA_USE_SYSTEM_QT})
if (DEV_BUILD AND (APPLE OR UNIX)) if (DEV_BUILD AND (APPLE OR UNIX))
# create a qt.conf file to override hard-coded search paths in Qt libs # create a qt.conf file to override hard-coded search paths in Qt libs
set(QT_LIB_PATH "${QT_CMAKE_PREFIX_PATH}/../..") set(QT_LIB_PATH "${QT_CMAKE_PREFIX_PATH}/../..")