From e64227bccdf2b83d171f7297b587e86a7ee0d483 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Sun, 3 Sep 2017 09:50:25 -0700 Subject: [PATCH] Fix mac build --- cmake/macros/SetupQt.cmake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cmake/macros/SetupQt.cmake b/cmake/macros/SetupQt.cmake index e83d85b284..b2a89f81e5 100644 --- a/cmake/macros/SetupQt.cmake +++ b/cmake/macros/SetupQt.cmake @@ -60,13 +60,15 @@ macro(setup_qt) string(REPLACE \\ / QT_DIR ${QT_DIR}) endif() - - if (NOT EXISTS "${QT_DIR}/include/QtCore/QtGlobal") - message(FATAL_ERROR "Unable to locate Qt includes in ${QT_DIR}") - endif() + # This check doesn't work on Mac + #if (NOT EXISTS "${QT_DIR}/include/QtCore/QtGlobal") + # message(FATAL_ERROR "Unable to locate Qt includes in ${QT_DIR}") + #endif() + if (NOT EXISTS "${QT_CMAKE_PREFIX_PATH}/Qt5Core/Qt5CoreConfig.cmake") message(FATAL_ERROR "Unable to locate Qt cmake config in ${QT_CMAKE_PREFIX_PATH}") endif() + message(STATUS "The Qt build in use is: \"${QT_DIR}\"") # Instruct CMake to run moc automatically when needed.