From 3fb15e4a4d94263964537a29c8ced87590d889d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 7 May 2017 22:19:01 +0200 Subject: NOISSUE include qt.conf in all bundles again Looks like it just doesn't work properly without that. --- application/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'application/CMakeLists.txt') diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt index 9c20f1d3..5101464b 100644 --- a/application/CMakeLists.txt +++ b/application/CMakeLists.txt @@ -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( -- cgit v1.2.3