diff options
| author | Mehmet Samet Duman <yongdohyun@projecttick.org> | 2026-03-31 20:13:44 +0300 |
|---|---|---|
| committer | Mehmet Samet Duman <yongdohyun@projecttick.org> | 2026-03-31 20:13:44 +0300 |
| commit | 9ceca41300ae3bbf1ba8dfe79674fc9a8da6fe8d (patch) | |
| tree | e82dafcdccf00312ee552275e3d2dcf5b536caed | |
| parent | 93a2a4498f10ad412dc3342513b7ee536408b4bb (diff) | |
| download | Project-Tick-9ceca41300ae3bbf1ba8dfe79674fc9a8da6fe8d.tar.gz Project-Tick-9ceca41300ae3bbf1ba8dfe79674fc9a8da6fe8d.zip | |
NOISSUE refactor CMake configuration for macOS bundle settings and update plist references
Signed-off-by: Mehmet Samet Duman <yongdohyun@projecttick.org>
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | cmake/MacOSXBundleInfo.plist.in | 8 | ||||
| -rw-r--r-- | cmake/vcpkg-ports/vcpkg-tool-meson/portfile.cmake | 2 | ||||
| -rw-r--r-- | launcher/CMakeLists.txt | 3 |
4 files changed, 9 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b6d77d6d08..b2c1ddedf0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -264,12 +264,10 @@ if(UNIX AND APPLE) set(FRAMEWORK_DEST_DIR "${MeshMC_Name}.app/Contents/Frameworks") set(RESOURCES_DEST_DIR "${MeshMC_Name}.app/Contents/Resources") set(JARS_DEST_DIR "${MeshMC_Name}.app/Contents/MacOS/jars") - set(PLUGIN_DEST_DIR "plugins") set(BUNDLE_DEST_DIR ".") - set(RESOURCES_DEST_DIR ".") # Set RPATH for macOS - SET(MeshMC_BINARY_RPATH "@executable_path") + SET(MeshMC_BINARY_RPATH "$ORIGIN/") # Mac bundle settings set(MACOSX_BUNDLE_BUNDLE_NAME "${MeshMC_DisplayName}") diff --git a/cmake/MacOSXBundleInfo.plist.in b/cmake/MacOSXBundleInfo.plist.in index eb40bacfd2..8a02e4a099 100644 --- a/cmake/MacOSXBundleInfo.plist.in +++ b/cmake/MacOSXBundleInfo.plist.in @@ -21,9 +21,9 @@ <key>CFBundleGetInfoString</key> <string>${MACOSX_BUNDLE_INFO_STRING}</string> <key>CFBundleIconFile</key> - <string>${Launcher_Name}</string> + <string>${MACOSX_BUNDLE_ICON_FILE}</string> <key>CFBundleIconName</key> - <string>${Launcher_Name}</string> + <string>${MeshMC_Name}</string> <key>CFBundleIdentifier</key> <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string> <key>CFBundleInfoDictionaryVersion</key> @@ -87,10 +87,10 @@ </dict> <dict> <key>CFBundleURLName</key> - <string>${Launcher_Name}</string> + <string>${MeshMC_Name}</string> <key>CFBundleURLSchemes</key> <array> - <string>prismlauncher</string> + <string>meshmc</string> <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string> </array> </dict> diff --git a/cmake/vcpkg-ports/vcpkg-tool-meson/portfile.cmake b/cmake/vcpkg-ports/vcpkg-tool-meson/portfile.cmake index d351e97982..e86349b141 100644 --- a/cmake/vcpkg-ports/vcpkg-tool-meson/portfile.cmake +++ b/cmake/vcpkg-ports/vcpkg-tool-meson/portfile.cmake @@ -10,7 +10,7 @@ set(patches adjust-args.patch remove-freebsd-pcfile-specialization.patch fix-libcpp-enable-assertions.patch # https://github.com/mesonbuild/meson/pull/14548, Remove in 1.8.3 - universal-osx.patch # NOTE(@getchoo): THIS IS THE ONLY CHANGE NEEDED FOR PRISM + universal-osx.patch # NOTE(@YongDo-Hyun): THIS IS THE ONLY CHANGE NEEDED FOR MESHMC ) set(scripts vcpkg-port-config.cmake diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index adabf31569..b79aebd331 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -980,6 +980,9 @@ endif() if(DEFINED MeshMC_AppBinaryName) set_target_properties(${MeshMC_Name} PROPERTIES OUTPUT_NAME "${MeshMC_AppBinaryName}") endif() +if(APPLE) + set_target_properties(${MeshMC_Name} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/MacOSXBundleInfo.plist.in") +endif() if(DEFINED MeshMC_BINARY_RPATH) SET_TARGET_PROPERTIES(${MeshMC_Name} PROPERTIES INSTALL_RPATH "${MeshMC_BINARY_RPATH}") endif() |