Skip to content

Commit 459c935

Browse files
committed
fix: arch pkg build error
1 parent 6c386d4 commit 459c935

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ if(WITH_DESKTOP)
504504

505505
if(WITH_X11_FEATURES)
506506
find_package(X11 REQUIRED)
507-
list(APPEND deps_libs X11 X11::Xtst X11::Xinerama)
507+
list(APPEND deps_libs X11)
508508

509509
find_package(Qt5 COMPONENTS X11Extras REQUIRED)
510510
list(APPEND deps_libs Qt5::X11Extras)
@@ -527,8 +527,9 @@ if(WITH_DESKTOP)
527527
if(BUILD_XDO)
528528
include(${cmake_path}/xdo.cmake)
529529
else()
530-
find_library(xdo_path xdo REQUIRED)
531-
list(APPEND deps_libs ${xdo_path})
530+
pkg_search_module(xdo REQUIRED libxdo)
531+
list(APPEND deps_libs ${xdo_LIBRARIES})
532+
list(APPEND includes ${xdo_INCLUDE_DIRS})
532533
endif()
533534
endif()
534535
endif()

cmake/xdo.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,7 @@ ExternalProject_Add(xdo
1515

1616
list(APPEND deps_libs "${external_lib_dir}/libxdo.a")
1717
list(APPEND deps xdo)
18+
19+
# libxdo depends on Xtst and Xinerama
20+
find_package(X11 COMPONENTS Xtst Xinerama REQUIRED)
21+
list(APPEND deps_libs X11::Xtst X11::Xinerama)

0 commit comments

Comments
 (0)