From 928a19a293b2c987accebaad08e06bbc2dd5c6db Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Wed, 14 Feb 2024 21:35:24 +0100 Subject: [PATCH] try fix signing issues --- cmake/common/advss_helpers.cmake | 12 ------------ cmake/macos/resources/create-package.cmake.in | 4 ++++ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/cmake/common/advss_helpers.cmake b/cmake/common/advss_helpers.cmake index 4ff996544..3f5a4894c 100644 --- a/cmake/common/advss_helpers.cmake +++ b/cmake/common/advss_helpers.cmake @@ -17,21 +17,12 @@ if(OS_MACOS) set(ADVSS_BUNDLE_MODULE_DIR "${ADVSS_BUNDLE_DIR}/Contents/MacOS") set(ADVSS_BUNDLE_PLUGIN_DIR ${ADVSS_BUNDLE_MODULE_DIR}/${_PLUGIN_FOLDER}) - function(resign_advss) - string(JSON _name GET ${buildspec} name) - get_target_property(_project_source_dir ${_name} SOURCE_DIR) - install( - CODE "execute_process(COMMAND /bin/sh -c \"codesign --force --deep --sign - ${_project_source_dir}/$/${ADVSS_BUNDLE_DIR}\")" - ) - endfunction() - function(install_advss_lib_helper target where) install( TARGETS ${target} RUNTIME DESTINATION "${where}" COMPONENT advss_plugins LIBRARY DESTINATION "${where}" COMPONENT advss_plugins FRAMEWORK DESTINATION "${where}" COMPONENT advss_plugins) - resign_advss() endfunction() function(install_advss_lib target) @@ -67,14 +58,12 @@ if(OS_MACOS) ${dep}_Runtime NAMELINK_COMPONENT ${dep}_Development) - resign_advss() endfunction() function(install_advss_plugin_dependency_file ${target} dep) target_sources(advanced-scene-switcher PRIVATE ${dep}) set_source_files_properties(${dep} PROPERTIES MACOSX_PACKAGE_LOCATION ${ADVSS_BUNDLE_PLUGIN_DIR}) - resign_advss() endfunction() # --- End of section --- @@ -293,7 +282,6 @@ function(setup_advss_plugin target) "${CMAKE_INSTALL_NAME_TOOL} -add_rpath @loader_path \\\"$\\\"" ) install(CODE "execute_process(COMMAND /bin/sh -c \"${_COMMAND}\")") - resign_advss() endif() # Set up include directories for headers generated by Qt diff --git a/cmake/macos/resources/create-package.cmake.in b/cmake/macos/resources/create-package.cmake.in index a2f1b112a..02883d592 100644 --- a/cmake/macos/resources/create-package.cmake.in +++ b/cmake/macos/resources/create-package.cmake.in @@ -13,6 +13,10 @@ endif() make_directory("$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/temp") +execute_process( + COMMAND codesign --force --deep --sign - + "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/package/@CMAKE_PROJECT_NAME@") + execute_process( COMMAND /usr/bin/pkgbuild --identifier '@MACOS_BUNDLEID@'