Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-11 12:02:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix qt.conf location for MacOS

Browse source
This commit is contained in:
Andrew Meadows 2019-05-15 09:34:08 -07:00
parent 5a27f15821
commit 9884d390b8
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/CMakeLists.txt
View file

@ -404,20 +404,20 @@ if (APPLE OR UNIX)
# need to worry about hard-coded search paths in the Qt libraries # 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 "${VCPKG_INSTALL_ROOT}/../qt5-install")
if (APPLE) if (APPLE)
set(QT_CONF_OVERRIDE "${RESOURCES_DEV_DIR}/../qt.conf") set(QT_CONF_FILE "${RESOURCES_DEV_DIR}/../Resources/qt.conf")
else () else ()
set(QT_CONF_OVERRIDE "${INTERFACE_EXEC_DIR}/qt.conf") set(QT_CONF_FILE "${INTERFACE_EXEC_DIR}/qt.conf")
endif () endif ()
if (DEFINED ENV{QT_CMAKE_PREFIX_PATH}) if (DEFINED ENV{QT_CMAKE_PREFIX_PATH})
# using VCPKG-installed Qt rather than a custom install # using VCPKG-installed Qt rather than a custom install
# TODO: erase old qt.conf file if it exists # TODO: erase old qt.conf file if it exists
# HINT: the file(REMOVE) operation below does not succeed # HINT: the file(REMOVE) operation below does not succeed
#file(REMOVE ${QT_CONF_OVERRIDE}) #file(REMOVE ${QT_CONF_FILE})
else () else ()
# using VCPKG-installed Qt rather than a custom install # using VCPKG-installed Qt rather than a custom install
# need to create qt.conf file to override hard coded # need to create qt.conf file to override hard coded
file(GENERATE file(GENERATE
OUTPUT "${QT_CONF_OVERRIDE}" OUTPUT "${QT_CONF_FILE}"
CONTENT "[Paths]\nPrefix=${QT_LIB_PATH}\n" CONTENT "[Paths]\nPrefix=${QT_LIB_PATH}\n"
) )
endif() endif()