diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-03-23 14:38:58 +0100 |
|---|---|---|
| committer | Sefa Eyeoglu <contact@scrumplex.net> | 2022-04-16 18:13:12 +0200 |
| commit | 6ed130fc1610da8d66ed17be9446e8f53bf96db5 (patch) | |
| tree | fcbacf3bd6e8ed0d2999ab56d69b3d5cdbe9c970 | |
| parent | 90d4acd1a1c9abeb31548d152c155491e2cf98fa (diff) | |
| download | PrismLauncher-6ed130fc1610da8d66ed17be9446e8f53bf96db5.tar.gz PrismLauncher-6ed130fc1610da8d66ed17be9446e8f53bf96db5.tar.bz2 PrismLauncher-6ed130fc1610da8d66ed17be9446e8f53bf96db5.zip | |
fix: don't allow portable builds on macOS
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | 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)) |