mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-11-20 08:10:11 +00:00
Code Issues Projects Releases Wiki Activity

NOISSUE include qt.conf in all bundles again

Browse Source 
Looks like it just doesn't work properly without that.
This commit is contained in:
Petr Mrázek 2017-05-07 22:19:01 +02:00
parent a379d43d7c
commit 3fb15e4a4d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
application/CMakeLists.txt
View File

@ -351,11 +351,6 @@ if(MultiMC_LAYOUT_REAL STREQUAL "mac-bundle")
# Add the icon
install(FILES resources/MultiMC.icns DESTINATION ${RESOURCES_DEST_DIR})
# Add qt.conf - because for some reason, an empty file is needed to make things work on macOS
install(
CODE "file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${RESOURCES_DEST_DIR}/qt.conf\" \"\")"
COMPONENT Runtime
)
elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-bundle")
set(BINARY_DEST_DIR "bin")
set(LIBRARY_DEST_DIR "bin")
@ -443,7 +438,12 @@ if(NOT INSTALL_BUNDLE)
${LIBRARY_DEST_DIR}
)
else()
# Bundle stuff
# Add qt.conf - this makes Qt stop looking for things outside the bundle
install(
CODE "file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${RESOURCES_DEST_DIR}/qt.conf\" \"\")"
COMPONENT Runtime
)
# Bundle plugins
if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
# Image formats
install(