From 9e0e1b287397b56152623e6fcc8837ba828cf11b Mon Sep 17 00:00:00 2001 From: Gregor Klevze Date: Wed, 10 Dec 2025 20:37:31 +0100 Subject: [PATCH] fixed bundlle --- CMakeLists.txt | 14 +++++++------- cmake/MacBundleInfo.plist.in | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d86d04..ba39b6f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,10 +65,16 @@ if(APPLE) if(EXISTS "${APP_ICON}") add_executable(tetris MACOSX_BUNDLE ${TETRIS_SOURCES} "${APP_ICON}") set_source_files_properties("${APP_ICON}" PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") - set_target_properties(tetris PROPERTIES MACOSX_BUNDLE_ICON_FILE "AppIcon") + set_target_properties(tetris PROPERTIES + MACOSX_BUNDLE_ICON_FILE "AppIcon" + MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/cmake/MacBundleInfo.plist.in" + ) else() message(WARNING "App icon not found at ${APP_ICON}; bundle will use default icon") add_executable(tetris MACOSX_BUNDLE ${TETRIS_SOURCES}) + set_target_properties(tetris PROPERTIES + MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/cmake/MacBundleInfo.plist.in" + ) endif() else() add_executable(tetris ${TETRIS_SOURCES}) @@ -80,12 +86,6 @@ if (WIN32) target_sources(tetris PRIVATE src/app_icon.rc) endif() -if(APPLE) - set_target_properties(tetris PROPERTIES - MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/cmake/MacBundleInfo.plist.in" - ) -endif() - if (WIN32) # Ensure favicon.ico is available in the build directory for the resource compiler set(FAVICON_SRC "${CMAKE_SOURCE_DIR}/assets/favicon/favicon.ico") diff --git a/cmake/MacBundleInfo.plist.in b/cmake/MacBundleInfo.plist.in index 2edadcf..73e760b 100644 --- a/cmake/MacBundleInfo.plist.in +++ b/cmake/MacBundleInfo.plist.in @@ -18,6 +18,8 @@ 1.0 CFBundleVersion 1.0 + CFBundleIconFile + AppIcon LSMinimumSystemVersion 12.0 NSHighResolutionCapable