From fd27ead2a7ca8aae58e9cac6277756fdb8a6dec6 Mon Sep 17 00:00:00 2001 From: derrod Date: Wed, 23 Mar 2022 08:45:02 +0100 Subject: [PATCH] cmake: Move obspython.py to Resources on macOS --- cmake/Modules/ObsHelpers_macOS.cmake | 11 +---------- cmake/bundle/macOS/bundleutils.cmake | 6 ------ 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/cmake/Modules/ObsHelpers_macOS.cmake b/cmake/Modules/ObsHelpers_macOS.cmake index 1b336d70c..2e162317a 100644 --- a/cmake/Modules/ObsHelpers_macOS.cmake +++ b/cmake/Modules/ObsHelpers_macOS.cmake @@ -292,16 +292,7 @@ function(setup_obs_modules target) if(TARGET obspython) install( FILES "$/obspython.py" - DESTINATION "PlugIns" - COMPONENT obs_plugin_dev - EXCLUDE_FROM_ALL) - - set(_COMMAND - "/usr/bin/codesign --force --sign \\\"${OBS_BUNDLE_CODESIGN_IDENTITY}\\\" $<$:--options linker-signed > \\\"\${CMAKE_INSTALL_PREFIX}/PlugIns/obspython.py\\\" > /dev/null" - ) - - install( - CODE "execute_process(COMMAND /bin/sh -c \"${_COMMAND}\")" + DESTINATION "Resources" COMPONENT obs_plugin_dev EXCLUDE_FROM_ALL) endif() diff --git a/cmake/bundle/macOS/bundleutils.cmake b/cmake/bundle/macOS/bundleutils.cmake index 99a93981c..895c8cb5b 100644 --- a/cmake/bundle/macOS/bundleutils.cmake +++ b/cmake/bundle/macOS/bundleutils.cmake @@ -85,12 +85,6 @@ if(EXISTS "${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/MacOS/obs-ffmpeg-mux") endif() -if(EXISTS - "${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/PlugIns/obspython.py") - list(APPEND _OTHER_BINARIES - "${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/PlugIns/obspython.py") -endif() - if(EXISTS "${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/Resources/obs-mac-virtualcam.plugin" )