2023-07-11 11:01:25 +00:00
|
|
|
From e8c4b54f753e57382ec756f07c114202bd9a19b8 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Luke Granger-Brown <git@lukegb.com>
|
|
|
|
Date: Thu, 6 Jul 2023 15:30:49 +0100
|
|
|
|
Subject: [PATCH] Provide runtime plugin destination as relative path
|
|
|
|
|
|
|
|
---
|
|
|
|
libobs/CMakeLists.txt | 2 ++
|
|
|
|
libobs/obsconfig.h.in | 2 +-
|
|
|
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
|
2022-11-21 17:40:18 +00:00
|
|
|
diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
|
2023-07-11 11:01:25 +00:00
|
|
|
index 1c092e1b8..3916a6216 100644
|
2022-11-21 17:40:18 +00:00
|
|
|
--- a/libobs/CMakeLists.txt
|
|
|
|
+++ b/libobs/CMakeLists.txt
|
2023-07-11 11:01:25 +00:00
|
|
|
@@ -253,6 +253,8 @@ elseif(OS_FREEBSD)
|
|
|
|
include(cmake/os-freebsd.cmake)
|
2022-11-21 17:40:18 +00:00
|
|
|
endif()
|
|
|
|
|
2023-07-11 11:01:25 +00:00
|
|
|
+set(OBS_PLUGIN_DESTINATION_RELATIVE "lib/obs-plugins")
|
2022-11-21 17:40:18 +00:00
|
|
|
+
|
2023-07-11 11:01:25 +00:00
|
|
|
configure_file(obsconfig.h.in "${CMAKE_BINARY_DIR}/config/obsconfig.h" @ONLY)
|
|
|
|
target_include_directories(libobs PUBLIC "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/config>"
|
|
|
|
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>")
|
2022-11-21 17:40:18 +00:00
|
|
|
diff --git a/libobs/obsconfig.h.in b/libobs/obsconfig.h.in
|
2023-07-11 11:01:25 +00:00
|
|
|
index b4de06623..c6dd9aba8 100644
|
2022-11-21 17:40:18 +00:00
|
|
|
--- a/libobs/obsconfig.h.in
|
|
|
|
+++ b/libobs/obsconfig.h.in
|
2023-07-11 11:01:25 +00:00
|
|
|
@@ -2,7 +2,9 @@
|
|
|
|
|
|
|
|
#cmakedefine OBS_DATA_PATH "@OBS_DATA_PATH@"
|
|
|
|
#cmakedefine OBS_PLUGIN_PATH "@OBS_PLUGIN_PATH@"
|
|
|
|
-#cmakedefine OBS_PLUGIN_DESTINATION "@OBS_PLUGIN_DESTINATION@"
|
|
|
|
+#define OBS_PLUGIN_DESTINATION "lib/obs-plugins"
|
|
|
|
+#cmakedefine OBS_PLUGIN_DESTINATION_ORIG "@OBS_PLUGIN_DESTINATION@"
|
|
|
|
+#cmakedefine OBS_INSTALL_PREFIX "@OBS_INSTALL_PREFIX@"
|
2022-11-21 17:40:18 +00:00
|
|
|
|
2023-07-11 11:01:25 +00:00
|
|
|
#cmakedefine GIO_FOUND
|
|
|
|
#cmakedefine PULSEAUDIO_FOUND
|
|
|
|
--
|
|
|
|
2.40.1
|
|
|
|
|