$NetBSD: patch-CorsixTH_CMakeLists.txt,v 1.1 2023/10/15 20:53:58 triaxx Exp $ Disable macOS bundle. --- CorsixTH/CMakeLists.txt.orig 2023-08-06 03:02:29.000000000 +0000 +++ CorsixTH/CMakeLists.txt @@ -23,9 +23,6 @@ if(USE_SOURCE_DATADIRS) elseif(MSVC) set(CORSIX_TH_DATADIR CorsixTH) set(CORSIX_TH_INTERPRETER_PATH ${CORSIX_TH_INTERPRETER_NAME}) -elseif(APPLE) - set(CORSIX_TH_DATADIR CorsixTH.app/Contents/Resources/) - set(CORSIX_TH_INTERPRETER_PATH ${CMAKE_INSTALL_PREFIX}/${CORSIX_TH_DATADIR}/${CORSIX_TH_INTERPRETER_NAME}) else() set(CORSIX_TH_DATADIR ${CMAKE_INSTALL_DATADIR}/corsix-th) set(CORSIX_TH_INTERPRETER_PATH ${CMAKE_INSTALL_FULL_DATADIR}/corsix-th/${CORSIX_TH_INTERPRETER_NAME}) @@ -33,16 +30,7 @@ endif() # Declaration of the executable if(APPLE) - set(corsixth_icon_file ${CMAKE_SOURCE_DIR}/CorsixTH/Icon.icns) - set_source_files_properties( - ${corsixth_icon_file} - PROPERTIES - MACOSX_PACKAGE_LOCATION Resources - ) - set(MACOSX_BUNDLE_ICON_FILE Icon.icns) - - add_executable(CorsixTH MACOSX_BUNDLE ${corsixth_icon_file}) - + add_executable(CorsixTH "") set_target_properties(CorsixTH PROPERTIES LINK_FLAGS_MINSIZEREL "-dead_strip") set_target_properties(CorsixTH PROPERTIES XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/../Frameworks") elseif(MSVC) @@ -80,7 +68,7 @@ if(SEARCH_LOCAL_DATADIRS) endif() target_link_libraries(CorsixTH CorsixTH_lib) -if(UNIX AND NOT APPLE) +if(UNIX) set_target_properties(CorsixTH PROPERTIES OUTPUT_NAME corsix-th) endif() @@ -249,10 +237,7 @@ endif() # Declaration of the install process if(NOT USE_SOURCE_DATADIRS) - if(APPLE) - # Just use the prefix as it's sufficient to just set the prefix to /Applications on Mac. - install(TARGETS CorsixTH BUNDLE DESTINATION .) - elseif(MSVC) + if(MSVC) install(TARGETS CorsixTH RUNTIME DESTINATION ${CORSIX_TH_DATADIR} LIBRARY DESTINATION ${CORSIX_TH_DATADIR} @@ -281,26 +266,12 @@ if(NOT USE_SOURCE_DATADIRS) ) install(FILES CorsixTH.lua ../LICENSE.txt DESTINATION ${CORSIX_TH_DATADIR}) - if(UNIX AND NOT APPLE) + if(UNIX) install(FILES corsix-th.6 DESTINATION ${CMAKE_INSTALL_MANDIR}/man6) install(FILES com.corsixth.corsixth.metainfo.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo) install(FILES com.corsixth.corsixth.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) install(FILES Original_Logo.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps RENAME corsix-th.svg) endif() - - if(APPLE) - # Fix the macOS bundle to include required libraries (create a redistributable app) - install(CODE " - INCLUDE(BundleUtilities) - SET(BU_CHMOD_BUNDLE_ITEMS ON) - FIXUP_BUNDLE(\"${CMAKE_INSTALL_PREFIX}/CorsixTH.app\" \"\" \"\") - ") - if(WITH_LUAROCKS) - install(CODE "execute_process( - COMMAND bash \"${CMAKE_SOURCE_DIR}/scripts/macos_luarocks\" \"${CMAKE_INSTALL_PREFIX}\") - ") - endif() - endif() endif() set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT CorsixTH)