From a0464b0f8f1d01a216da4e73fb5a9769b5f1094e Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Sun, 28 Feb 2021 17:59:17 -0300 Subject: [PATCH] linux-capture: Shuffle around CMake code In preparation for the introduction of the new PipeWire-based capture, use variables for include_directories() and target_link_libraries(), and move them to the bottom of the file. --- plugins/linux-capture/CMakeLists.txt | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/plugins/linux-capture/CMakeLists.txt b/plugins/linux-capture/CMakeLists.txt index 7f876954c..7ebdc500c 100644 --- a/plugins/linux-capture/CMakeLists.txt +++ b/plugins/linux-capture/CMakeLists.txt @@ -9,7 +9,7 @@ endif() find_package(XCB COMPONENTS XCB RANDR SHM XFIXES XINERAMA REQUIRED) find_package(X11_XCB REQUIRED) -include_directories(SYSTEM +set(linux-capture_INCLUDES "${CMAKE_SOURCE_DIR}/libobs" ${X11_Xcomposite_INCLUDE_PATH} ${X11_X11_INCLUDE_PATH} @@ -34,11 +34,7 @@ set(linux-capture_HEADERS xcompcap-helper.hpp ) -add_library(linux-capture MODULE - ${linux-capture_SOURCES} - ${linux-capture_HEADERS} -) -target_link_libraries(linux-capture +set(linux-capture_LIBRARIES libobs glad ${X11_LIBRARIES} @@ -47,6 +43,18 @@ target_link_libraries(linux-capture ${X11_Xcomposite_LIB} ${XCB_LIBRARIES} ) + +include_directories(SYSTEM + ${linux-capture_INCLUDES} +) +add_library(linux-capture MODULE + ${linux-capture_SOURCES} + ${linux-capture_HEADERS} +) +target_link_libraries(linux-capture + ${linux-capture_LIBRARIES} +) + set_target_properties(linux-capture PROPERTIES FOLDER "plugins") install_obs_plugin_with_data(linux-capture data)