deps,shared,frontend-tools: Move obs-scripting to shared folder

This commit is contained in:
tytan652 2023-08-02 11:07:51 +02:00
parent 4b1e16203f
commit 21b47c4f91
32 changed files with 6 additions and 2 deletions

View file

@ -51,7 +51,7 @@ target_link_libraries(
$<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD>:X11::X11>
$<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD>:Qt::GuiPrivate>)
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/obs-scripting" "${CMAKE_BINARY_DIR}/deps/obs-scripting")
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/obs-scripting" "${CMAKE_BINARY_DIR}/shared/obs-scripting")
if(ENABLE_SCRIPTING AND TARGET OBS::scripting)
target_sources(frontend-tools PRIVATE scripts.cpp scripts.hpp)

View file

@ -53,6 +53,8 @@ if(OS_POSIX AND NOT OS_MACOS)
target_link_libraries(frontend-tools PRIVATE Qt::GuiPrivate)
endif()
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/obs-scripting" "${CMAKE_BINARY_DIR}/shared/obs-scripting")
if(ENABLE_SCRIPTING AND TARGET OBS::scripting)
target_compile_definitions(frontend-tools PRIVATE ENABLE_SCRIPTING)

1
deps/CMakeLists.txt vendored
View file

@ -5,5 +5,4 @@ endif()
add_subdirectory(blake2)
add_subdirectory(glad)
add_subdirectory(libcaption)
add_subdirectory(obs-scripting)
add_subdirectory(opts-parser)

View file

@ -176,3 +176,6 @@ target_compile_definitions(obs-scripting PRIVATE SCRIPT_DIR="${OBS_SCRIPT_PLUGIN
$<$<BOOL:${ENABLE_UI}>:ENABLE_UI>)
setup_binary_target(obs-scripting)
# Dirty workaround: CMake 2.0 seems to fail without this file
file(TOUCH "${CMAKE_BINARY_DIR}/shared/cmake_install.cmake")