File tree Expand file tree Collapse file tree 3 files changed +19
-4
lines changed
Expand file tree Collapse file tree 3 files changed +19
-4
lines changed Original file line number Diff line number Diff line change @@ -126,13 +126,28 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
126126 install (
127127 DIRECTORY "${CMAKE_SOURCE_DIR} /.deps/obs-deps-qt6-${qtversion} -universal/lib/QtWebSockets.framework"
128128 CONFIGURATIONS RelWithDebInfo Debug Release
129- DESTINATION "${CMAKE_PROJECT_NAME} .plugin/Contents/Frameworks "
129+ DESTINATION ". "
130130 OPTIONAL )
131131 install (
132132 DIRECTORY "${CMAKE_SOURCE_DIR} /.deps/obs-deps-qt6-${qtversion} -universal/plugins/tls"
133133 CONFIGURATIONS RelWithDebInfo Debug Release
134- DESTINATION "${CMAKE_PROJECT_NAME} .plugin/Contents/Frameworks "
134+ DESTINATION ". "
135135 OPTIONAL )
136+
137+ install (
138+ CODE [===[
139+ if(EXISTS "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/QtWebSockets.framework" AND NOT IS_SYMLINK "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/QtWebSockets.framework")
140+ file(INSTALL DESTINATION "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/package/Library/Application Support/obs-studio/plugins"
141+ TYPE DIRECTORY FILES "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/QtWebSockets.framework" USE_SOURCE_PERMISSIONS)
142+ endif()
143+ ]===])
144+ install (
145+ CODE [===[
146+ if(EXISTS "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/tls" AND NOT IS_SYMLINK "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/tls")
147+ file(INSTALL DESTINATION "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/package/Library/Application Support/obs-studio/plugins"
148+ TYPE DIRECTORY FILES "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/tls" USE_SOURCE_PERMISSIONS)
149+ endif()
150+ ]===])
136151endif ()
137152
138153set_target_properties_plugin(${CMAKE_PROJECT_NAME} PROPERTIES OUTPUT_NAME ${_name} )
Original file line number Diff line number Diff line change @@ -171,4 +171,4 @@ set(CMAKE_COLOR_DIAGNOSTICS TRUE)
171171# Disable usage of RPATH in build or install configurations
172172set (CMAKE_SKIP_RPATH TRUE )
173173# Have Xcode set default RPATH entries
174- set (CMAKE_XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/../Frameworks @loader_path/../Frameworks " )
174+ set (CMAKE_XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/../Frameworks @loader_path/../../../ " )
Original file line number Diff line number Diff line change @@ -82,7 +82,7 @@ bool obs_module_load(void)
8282{
8383#ifdef __APPLE__
8484 QFileInfo moduleFile (obs_get_module_binary_path (obs_current_module ()));
85- auto libraryPath = QString (" %1/../Frameworks " ).arg (moduleFile.dir ().path ());
85+ auto libraryPath = QString (" %1/../../../ " ).arg (moduleFile.dir ().path ());
8686 QCoreApplication::addLibraryPath (libraryPath);
8787#endif
8888
You can’t perform that action at this time.
0 commit comments