From 9884d390b898650ebedc46583e0c164eef839b89 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 15 May 2019 09:34:08 -0700 Subject: [PATCH] fix qt.conf location for MacOS --- interface/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 7bf6bc1a86..133ef05136 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -404,20 +404,20 @@ 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") if (APPLE) - set(QT_CONF_OVERRIDE "${RESOURCES_DEV_DIR}/../qt.conf") + set(QT_CONF_FILE "${RESOURCES_DEV_DIR}/../Resources/qt.conf") else () - set(QT_CONF_OVERRIDE "${INTERFACE_EXEC_DIR}/qt.conf") + 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_OVERRIDE}) + #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_OVERRIDE}" + OUTPUT "${QT_CONF_FILE}" CONTENT "[Paths]\nPrefix=${QT_LIB_PATH}\n" ) endif()