Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-10 06:12:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

more correct qt.conf for Linux and MacOS dev environment

Browse source
This commit is contained in:
Andrew Meadows 2019-05-20 11:50:09 -04:00
parent 528a64c618
commit 9b78edd062
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
interface/CMakeLists.txt
View file

@ -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)