Skip to content

Commit

Permalink
try fix signing issues
Browse files Browse the repository at this point in the history
  • Loading branch information
WarmUpTill committed Feb 14, 2024
1 parent 72ca9b5 commit 928a19a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 deletions.
12 changes: 0 additions & 12 deletions cmake/common/advss_helpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}/$<INSTALL_PREFIX>/${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)
Expand Down Expand Up @@ -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 ---
Expand Down Expand Up @@ -293,7 +282,6 @@ function(setup_advss_plugin target)
"${CMAKE_INSTALL_NAME_TOOL} -add_rpath @loader_path \\\"$<TARGET_FILE:${target}>\\\""
)
install(CODE "execute_process(COMMAND /bin/sh -c \"${_COMMAND}\")")
resign_advss()
endif()

# Set up include directories for headers generated by Qt
Expand Down
4 changes: 4 additions & 0 deletions cmake/macos/resources/create-package.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -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@'
Expand Down

0 comments on commit 928a19a

Please sign in to comment.