From 736d002f5993d95175d955eda454321d7a6f3deb Mon Sep 17 00:00:00 2001 From: Anthony Thibault Date: Thu, 30 May 2019 09:44:27 -0700 Subject: [PATCH] Apparently APPLE is UNIX in cmake. --- cmake/macros/SetupQt.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/macros/SetupQt.cmake b/cmake/macros/SetupQt.cmake index 593fd31a5a..3ef0f9cde8 100644 --- a/cmake/macros/SetupQt.cmake +++ b/cmake/macros/SetupQt.cmake @@ -52,7 +52,7 @@ macro(setup_qt) message(FATAL_ERROR "VCPKG_QT_CMAKE_PREFIX_PATH should have been set by hifi_vcpkg.py") endif() if (NOT DEV_BUILD) - if (UNIX AND DEFINED ENV{QT_CMAKE_PREFIX_PATH}) + if (UNIX AND DEFINED ENV{QT_CMAKE_PREFIX_PATH} AND NOT APPLE) # HACK: obey QT_CMAKE_PREFIX_PATH to allow UNIX to use older QT libs message("HACK: obey QT_CMAKE_PREFIX_PATH on UNIX") set(QT_CMAKE_PREFIX_PATH $ENV{QT_CMAKE_PREFIX_PATH}) @@ -69,6 +69,8 @@ macro(setup_qt) endif() endif() + message("QT_CMAKE_PREFIX_PATH = " ${QT_CMAKE_PREFIX_PATH}) + # figure out where the qt dir is get_filename_component(QT_DIR "${QT_CMAKE_PREFIX_PATH}/../../" ABSOLUTE) set(QT_VERSION "unknown")