From 0c33f46ab1f48eb518c05d6c794356736056607d Mon Sep 17 00:00:00 2001
From: Flame Soulis <flamesoulis@flamesoulis.com>
Date: Thu, 5 Oct 2017 21:42:16 -0400
Subject: [PATCH] Update SetupQt.cmake

This change allows -DQT_CMAKE_PREFIX_PATH to function again. Previously, set(QT_CMAKE_PREFIX_PATH "$ENV{QT_CMAKE_PREFIX_PATH}") always ran, which overrode QT_CMAKE_PREFIX_PATH every time on cmake. This proposed change now only uses the environment variable if DQT_CMAKE_PREFIX_PATH is not specified.
---
 cmake/macros/SetupQt.cmake | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cmake/macros/SetupQt.cmake b/cmake/macros/SetupQt.cmake
index ece8607b9b..bbdce06f37 100644
--- a/cmake/macros/SetupQt.cmake
+++ b/cmake/macros/SetupQt.cmake
@@ -44,7 +44,11 @@ endfunction()
 # Sets the QT_CMAKE_PREFIX_PATH and QT_DIR variables
 # Also enables CMAKE_AUTOMOC and CMAKE_AUTORCC
 macro(setup_qt)
-    set(QT_CMAKE_PREFIX_PATH "$ENV{QT_CMAKE_PREFIX_PATH}")
+    # if QT_CMAKE_PREFIX_PATH was not specified before hand,
+    # try to use the environment variable
+    if (NOT QT_CMAKE_PREFIX_PATH)
+        set(QT_CMAKE_PREFIX_PATH "$ENV{QT_CMAKE_PREFIX_PATH}")
+    endif()
     if (("QT_CMAKE_PREFIX_PATH" STREQUAL "") OR (NOT EXISTS "${QT_CMAKE_PREFIX_PATH}"))
         calculate_default_qt_dir(QT_DIR)
         set(QT_CMAKE_PREFIX_PATH "${QT_DIR}/lib/cmake")
@@ -81,4 +85,4 @@ macro(setup_qt)
         add_paths_to_fixup_libs("${QT_DIR}/bin")
     endif ()
 
-endmacro()
\ No newline at end of file
+endmacro()