diff options
| author | Brad King <brad.king@kitware.com> | 2022-03-09 17:14:09 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-03-09 17:14:16 (GMT) |
| commit | 4802b27e64db507a36c73cdabd7fd2ef01fda228 (patch) | |
| tree | 7a332af4d1b895a8e45454e4797582da514afcc7 /Modules | |
| parent | 85a82a3dee0bf92eaa51f5b6e64a68840153438e (diff) | |
| parent | 364798fa6b87be4add346036ac68e47cad3bfd14 (diff) | |
| download | CMake-4802b27e64db507a36c73cdabd7fd2ef01fda228.zip CMake-4802b27e64db507a36c73cdabd7fd2ef01fda228.tar.gz CMake-4802b27e64db507a36c73cdabd7fd2ef01fda228.tar.bz2 | |
Merge topic 'FindX11--xcb-randr'
364798fa6b FindX11: Add xcb_randr library
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7046
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindX11.cmake | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake index fd5ee53..5a9d2a0 100644 --- a/Modules/FindX11.cmake +++ b/Modules/FindX11.cmake @@ -31,6 +31,7 @@ and also the following more fine grained variables and targets: X11_xcb_INCLUDE_PATH, X11_xcb_LIB, X11_xcb_FOUND, X11::xcb X11_X11_xcb_INCLUDE_PATH, X11_X11_xcb_LIB, X11_X11_xcb_FOUND, X11::X11_xcb X11_xcb_icccm_INCLUDE_PATH, X11_xcb_icccm_LIB, X11_xcb_icccm_FOUND, X11::xcb_icccm + X11_xcb_randr_INCLUDE_PATH, X11_xcb_randr_LIB, X11_xcb_randr_FOUND, X11::xcb_randr X11_xcb_util_INCLUDE_PATH, X11_xcb_util_LIB, X11_xcb_util_FOUND, X11::xcb_util X11_xcb_xfixes_INCLUDE_PATH, X11_xcb_xfixes_LIB, X11_xcb_xfixes_FOUND, X11::xcb_xfixes X11_xcb_xkb_INCLUDE_PATH, X11_xcb_xkb_LIB, X11_xcb_xkb_FOUND, X11::xcb_xkb @@ -82,6 +83,9 @@ and also the following more fine grained variables and targets: .. versionadded:: 3.19 Added the ``Xaw``, ``xcb_util``, and ``xcb_xfixes`` libraries. +.. versionadded:: 3.24 + Added the ``xcb_randr`` library. + #]=======================================================================] if (UNIX) @@ -127,6 +131,7 @@ if (UNIX) find_path(X11_xcb_INCLUDE_PATH xcb/xcb.h ${X11_INC_SEARCH_PATH}) find_path(X11_X11_xcb_INCLUDE_PATH X11/Xlib-xcb.h ${X11_INC_SEARCH_PATH}) find_path(X11_xcb_icccm_INCLUDE_PATH xcb/xcb_icccm.h ${X11_INC_SEARCH_PATH}) + find_path(X11_xcb_randr_INCLUDE_PATH xcb/randr.h ${X11_INC_SEARCH_PATH}) find_path(X11_xcb_util_INCLUDE_PATH xcb/xcb_aux.h ${X11_INC_SEARCH_PATH}) find_path(X11_xcb_xfixes_INCLUDE_PATH xcb/xfixes.h ${X11_INC_SEARCH_PATH}) find_path(X11_Xcomposite_INCLUDE_PATH X11/extensions/Xcomposite.h ${X11_INC_SEARCH_PATH}) @@ -180,6 +185,7 @@ if (UNIX) find_library(X11_xcb_LIB xcb ${X11_LIB_SEARCH_PATH}) find_library(X11_X11_xcb_LIB X11-xcb ${X11_LIB_SEARCH_PATH}) find_library(X11_xcb_icccm_LIB xcb-icccm ${X11_LIB_SEARCH_PATH}) + find_library(X11_xcb_randr_LIB xcb-randr ${X11_LIB_SEARCH_PATH}) find_library(X11_xcb_util_LIB xcb-util ${X11_LIB_SEARCH_PATH}) find_library(X11_xcb_xfixes_LIB xcb-xfixes ${X11_LIB_SEARCH_PATH}) find_library(X11_xcb_xkb_LIB xcb-xkb ${X11_LIB_SEARCH_PATH}) @@ -281,6 +287,10 @@ if (UNIX) set(X11_xcb_icccm_FOUND TRUE) endif () + if (X11_xcb_randr_LIB AND X11_xcb_randr_INCLUDE_PATH) + set(X11_xcb_randr_FOUND TRUE) + endif () + if (X11_xcb_util_LIB AND X11_xcb_util_INCLUDE_PATH) set(X11_xcb_util_FOUND TRUE) endif () @@ -600,6 +610,13 @@ if (UNIX) INTERFACE_LINK_LIBRARIES "X11::xcb") endif () + if (X11_xcb_randr_FOUND AND NOT TARGET X11::xcb_randr) + add_library(X11::xcb_randr UNKNOWN IMPORTED) + set_target_properties(X11::xcb_randr PROPERTIES + IMPORTED_LOCATION "${X11_xcb_randr_LIB}" + INTERFACE_LINK_LIBRARIES "X11::xcb") + endif () + if (X11_xcb_util_FOUND AND NOT TARGET X11::xcb_util) add_library(X11::xcb_util UNKNOWN IMPORTED) set_target_properties(X11::xcb_util PROPERTIES @@ -830,6 +847,8 @@ if (UNIX) X11_xcb_INCLUDE_PATH X11_xcb_icccm_LIB X11_xcb_icccm_INCLUDE_PATH + X11_xcb_randr_LIB + X11_xcb_randr_INCLUDE_PATH X11_xcb_util_LIB X11_xcb_util_INCLUDE_PATH X11_xcb_xfixes_LIB |