2017-04-19 20:48:37 +00:00
|
|
|
From: Sebastian Ramacher <sramacher@debian.org>
|
|
|
|
|
Date: Wed, 19 Apr 2017 23:02:17 +0200
|
|
|
|
|
Subject: Link with xcb and X libraries to fix underlinking
|
|
|
|
|
|
|
|
|
|
---
|
2018-12-16 16:18:48 +00:00
|
|
|
libobs/CMakeLists.txt | 13 +++++++++----
|
|
|
|
|
1 file changed, 9 insertions(+), 4 deletions(-)
|
2017-04-19 20:48:37 +00:00
|
|
|
|
|
|
|
|
diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
|
2019-09-22 21:29:12 +00:00
|
|
|
index 5f48eb2..3acb58c 100644
|
2017-04-19 20:48:37 +00:00
|
|
|
--- a/libobs/CMakeLists.txt
|
|
|
|
|
+++ b/libobs/CMakeLists.txt
|
2018-12-16 16:18:48 +00:00
|
|
|
@@ -13,8 +13,8 @@ endif()
|
|
|
|
|
|
|
|
|
|
if(UNIX)
|
2017-04-19 20:48:37 +00:00
|
|
|
if (NOT APPLE)
|
|
|
|
|
- find_package(X11_XCB REQUIRED)
|
2018-12-16 16:18:48 +00:00
|
|
|
- find_package(XCB OPTIONAL_COMPONENTS XINPUT)
|
|
|
|
|
+ find_package(XCB COMPONENTS XCB REQUIRED OPTIONAL_COMPONENTS XINPUT)
|
2018-12-16 16:27:38 +00:00
|
|
|
+ find_package(X11 REQUIRED)
|
2018-12-16 16:18:48 +00:00
|
|
|
if (XCB_XINPUT_FOUND)
|
|
|
|
|
set(USE_XINPUT "1")
|
|
|
|
|
else()
|
2019-09-22 21:29:12 +00:00
|
|
|
@@ -199,12 +199,17 @@ elseif(UNIX)
|
2017-04-19 20:48:37 +00:00
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
include_directories(
|
|
|
|
|
- ${X11_XCB_INCLUDE_DIRS})
|
|
|
|
|
+ ${XCB_INCLUDE_DIRS}
|
|
|
|
|
+ ${X11_XCB_INCLUDE_DIRS}
|
|
|
|
|
+ ${X11_X11_INCLUDE_DIRS})
|
|
|
|
|
add_definitions(
|
|
|
|
|
+ ${XCB_DEFINITIONS}
|
|
|
|
|
${X11_XCB_DEFINITIONS})
|
|
|
|
|
set(libobs_PLATFORM_DEPS
|
|
|
|
|
${libobs_PLATFORM_DEPS}
|
|
|
|
|
- ${X11_XCB_LIBRARIES})
|
|
|
|
|
+ ${XCB_LIBRARIES}
|
|
|
|
|
+ ${X11_XCB_LIBRARIES}
|
|
|
|
|
+ ${X11_X11_LIB})
|
|
|
|
|
|
2018-12-16 16:18:48 +00:00
|
|
|
if(USE_XINPUT)
|
|
|
|
|
include_directories(
|
