From 9b78edd0625b3d7d9eb0ff85e157acd0890cd21f Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Mon, 20 May 2019 11:50:09 -0400
Subject: [PATCH] more correct qt.conf for Linux and MacOS dev environment

---
 interface/CMakeLists.txt | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 85364d08d2..0b94c4296d 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -403,25 +403,16 @@ endif()
 
 if (APPLE OR UNIX)
   # need to worry about hard-coded search paths in the Qt libraries
-  set(QT_LIB_PATH "${VCPKG_INSTALL_ROOT}/../qt5-install")
+  set(QT_LIB_PATH "${QT_CMAKE_PREFIX_PATH}/../..")
   if (APPLE)
     set(QT_CONF_FILE "${RESOURCES_DEV_DIR}/../Resources/qt.conf")
   else ()
     set(QT_CONF_FILE "${INTERFACE_EXEC_DIR}/qt.conf")
   endif ()
-  if (DEFINED ENV{QT_CMAKE_PREFIX_PATH})
-    # using VCPKG-installed Qt rather than a custom install
-    # TODO: erase old qt.conf file if it exists
-    # HINT: the file(REMOVE) operation below does not succeed
-    #file(REMOVE ${QT_CONF_FILE})
-  else ()
-    # using VCPKG-installed Qt rather than a custom install
-    # need to create qt.conf file to override hard coded 
-    file(GENERATE
-      OUTPUT "${QT_CONF_FILE}"
-      CONTENT "[Paths]\nPrefix=${QT_LIB_PATH}\n"
-    )
-  endif()
+  file(GENERATE
+    OUTPUT "${QT_CONF_FILE}"
+    CONTENT "[Paths]\nPrefix=${QT_LIB_PATH}\n"
+  )
 endif()
 
 if (SCRIPTS_INSTALL_DIR)