From 6ed130fc1610da8d66ed17be9446e8f53bf96db5 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 23 Mar 2022 14:38:58 +0100 Subject: [PATCH] fix: don't allow portable builds on macOS --- CMakeLists.txt | 6 ++++-- launcher/Application.cpp | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cf06fe0d..5061de3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -169,8 +169,10 @@ add_subdirectory(program_info) # Target install directory, relative to CMAKE_INSTALL_PREFIx set(BUNDLE_DEST_DIR ".") -# Install "portable.txt" if selected component is "portable" -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/${Launcher_Portable_File}" DESTINATION ${BUNDLE_DEST_DIR} COMPONENT portable EXCLUDE_FROM_ALL) +if(NOT (UNIX AND APPLE)) + # Install "portable.txt" if selected component is "portable" + install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/${Launcher_Portable_File}" DESTINATION ${BUNDLE_DEST_DIR} COMPONENT portable EXCLUDE_FROM_ALL) +endif() if(UNIX AND APPLE) set(BINARY_DEST_DIR "${Launcher_Name}.app/Contents/MacOS") diff --git a/launcher/Application.cpp b/launcher/Application.cpp index a9f7a0f0..6e934fa4 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -363,10 +363,12 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv) } #endif +#ifndef Q_OS_MACOS if (QFile::exists(FS::PathCombine(m_rootPath, "portable.txt"))) { dataPath = m_rootPath; adjustedBy = "Portable data path"; } +#endif } if (!FS::ensureFolderPathExists(dataPath))