mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-25 13:09:43 +00:00
Code Issues Releases Wiki Activity

Merge branch 're-sign-mac-applications' into 'master'

Browse source 
Re-sign Mac Applications before creating install package

See merge request OpenMW/openmw!2418

(cherry picked from commit 1dd392d33d)

52501b7b Re-sign Mac Applications before creating install package
e4f04390 Merge commit 'cd8b20439ec707574826679a8f851546c78e294e' into re-sign-mac-applications
71f6f950 Make Mac Plugins osgPlugins symlink relative
9f7e1324 Made CMake 3.19 requirement specific to macOS app packaging.
This commit is contained in:
AnyOldName3 2022-09-21 22:15:43 +00:00 committed by psi29a
parent 1bf3d6b01a
commit 87eaa38cf7
2 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -790,8 +790,8 @@ endif()
# Apple bundling # Apple bundling
if (OPENMW_OSX_DEPLOYMENT AND APPLE) if (OPENMW_OSX_DEPLOYMENT AND APPLE)
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.13 AND CMAKE_VERSION VERSION_LESS 3.13.4) if (CMAKE_VERSION VERSION_LESS 3.19)
message(FATAL_ERROR "macOS packaging is broken in early CMake 3.13 releases, see https://gitlab.com/OpenMW/openmw/issues/4767. Please use at least 3.13.4 or an older version like 3.12.4") message(FATAL_ERROR "macOS packaging requires CMake 3.19 or higher to sign macOS app bundles.")
endif () endif ()
get_property(QT_COCOA_PLUGIN_PATH TARGET Qt5::QCocoaIntegrationPlugin PROPERTY LOCATION_RELEASE) get_property(QT_COCOA_PLUGIN_PATH TARGET Qt5::QCocoaIntegrationPlugin PROPERTY LOCATION_RELEASE)
@ -887,6 +887,9 @@ if (OPENMW_OSX_DEPLOYMENT AND APPLE)
fixup_bundle(\"${INSTALLED_OPENMW_APP}\" \"${PLUGINS}\" \"\") fixup_bundle(\"${INSTALLED_OPENMW_APP}\" \"${PLUGINS}\" \"\")
fixup_bundle(\"${INSTALLED_OPENCS_APP}\" \"${OPENCS_PLUGINS}\" \"\") fixup_bundle(\"${INSTALLED_OPENCS_APP}\" \"${OPENCS_PLUGINS}\" \"\")
" COMPONENT Runtime) " COMPONENT Runtime)
set(CPACK_PRE_BUILD_SCRIPTS ${CMAKE_SOURCE_DIR}/cmake/SignMacApplications.cmake)
include(CPack) include(CPack)
elseif(NOT APPLE) elseif(NOT APPLE)
get_generator_is_multi_config(multi_config) get_generator_is_multi_config(multi_config)

21
cmake/SignMacApplications.cmake Normal file
View file

@ -0,0 +1,21 @@
# This script re-signs OpenMW.app and OpenMW-CS.app after CPack packages them. This is necessary because CPack modifies
# the library references used by OpenMW to App relative paths, invalidating the code signature.
# Obviously, we only need to run this on Apple targets.
if (APPLE)
set(OPENMW_APP "OpenMW")
set(OPENMW_CS_APP "OpenMW-CS")
set(APPLICATIONS "${OPENMW_APP}" "${OPENMW_CS_APP}")
foreach(app_name IN LISTS APPLICATIONS)
set(FULL_APP_PATH "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/ALL_IN_ONE/${app_name}.app")
message(STATUS "Re-signing ${app_name}.app")
# Apple's codesign utility does not like directories with periods (.) in their names, so we'll remove it and
# create a symlink using the original name, which codesign is fine with.
file(GLOB OSG_PLUGINS_DIR "${FULL_APP_PATH}/Contents/PlugIns/osgPlugins*")
file(RENAME "${OSG_PLUGINS_DIR}" "${FULL_APP_PATH}/Contents/PlugIns/osgPlugins")
execute_process(COMMAND "ln" "-s" "osgPlugins" "${OSG_PLUGINS_DIR}"
WORKING_DIRECTORY "${FULL_APP_PATH}/Contents/PlugIns/")
execute_process(COMMAND "codesign" "--force" "--deep" "-s" "-" "${FULL_APP_PATH}")
endforeach(app_name)
endif (APPLE)