mirror of
https://github.com/Kitware/CMake.git
synced 2025-12-31 19:00:54 -06:00
FindX11: Arrange xcb modules in proper alphabetical order
This commit is contained in:
@@ -32,14 +32,14 @@ and also the following more fine grained variables and targets:
|
||||
X11_X11_xcb_INCLUDE_PATH, X11_X11_xcb_LIB, X11_X11_xcb_FOUND, X11::X11_xcb
|
||||
X11_xcb_cursor_INCLUDE_PATH, X11_xcb_cursor_LIB, X11_xcb_cursor_FOUND, X11::xcb_cursor
|
||||
X11_xcb_icccm_INCLUDE_PATH, X11_xcb_icccm_LIB, X11_xcb_icccm_FOUND, X11::xcb_icccm
|
||||
X11_xcb_keysyms_INCLUDE_PATH, X11_xcb_keysyms_LIB,X11_xcb_keysyms_FOUND,X11::xcb_keysyms
|
||||
X11_xcb_randr_INCLUDE_PATH, X11_xcb_randr_LIB, X11_xcb_randr_FOUND, X11::xcb_randr
|
||||
X11_xcb_shape_INCLUDE_PATH, X11_xcb_shape_LIB, X11_xcb_shape_FOUND, X11::xcb_shape
|
||||
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
|
||||
X11_xcb_xrm_INCLUDE_PATH, X11_xcb_xrm_LIB, X11_xcb_xrm_FOUND, X11::xcb_xrm
|
||||
X11_xcb_xtest_INCLUDE_PATH, X11_xcb_xtest_LIB, X11_xcb_xtest_FOUND, X11::xcb_xtest
|
||||
X11_xcb_keysyms_INCLUDE_PATH, X11_xcb_keysyms_LIB,X11_xcb_keysyms_FOUND,X11::xcb_keysyms
|
||||
X11_xcb_xkb_INCLUDE_PATH, X11_xcb_xkb_LIB, X11_xcb_xkb_FOUND, X11::xcb_xkb
|
||||
X11_Xcomposite_INCLUDE_PATH, X11_Xcomposite_LIB, X11_Xcomposite_FOUND, X11::Xcomposite
|
||||
X11_Xcursor_INCLUDE_PATH, X11_Xcursor_LIB, X11_Xcursor_FOUND, X11::Xcursor
|
||||
X11_Xdamage_INCLUDE_PATH, X11_Xdamage_LIB, X11_Xdamage_FOUND, X11::Xdamage
|
||||
@@ -140,13 +140,13 @@ if (UNIX)
|
||||
find_path(X11_X11_xcb_INCLUDE_PATH X11/Xlib-xcb.h ${X11_INC_SEARCH_PATH})
|
||||
find_path(X11_xcb_cursor_INCLUDE_PATH xcb/xcb_cursor.h ${X11_INC_SEARCH_PATH})
|
||||
find_path(X11_xcb_icccm_INCLUDE_PATH xcb/xcb_icccm.h ${X11_INC_SEARCH_PATH})
|
||||
find_path(X11_xcb_keysyms_INCLUDE_PATH xcb/xcb_keysyms.h ${X11_INC_SEARCH_PATH})
|
||||
find_path(X11_xcb_randr_INCLUDE_PATH xcb/randr.h ${X11_INC_SEARCH_PATH})
|
||||
find_path(X11_xcb_shape_INCLUDE_PATH xcb/shape.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_xcb_xrm_INCLUDE_PATH xcb/xcb_xrm.h ${X11_INC_SEARCH_PATH})
|
||||
find_path(X11_xcb_xtest_INCLUDE_PATH xcb/xtest.h ${X11_INC_SEARCH_PATH})
|
||||
find_path(X11_xcb_keysyms_INCLUDE_PATH xcb/xcb_keysyms.h ${X11_INC_SEARCH_PATH})
|
||||
find_path(X11_Xcomposite_INCLUDE_PATH X11/extensions/Xcomposite.h ${X11_INC_SEARCH_PATH})
|
||||
find_path(X11_Xcursor_INCLUDE_PATH X11/Xcursor/Xcursor.h ${X11_INC_SEARCH_PATH})
|
||||
find_path(X11_Xdamage_INCLUDE_PATH X11/extensions/Xdamage.h ${X11_INC_SEARCH_PATH})
|
||||
@@ -199,14 +199,14 @@ if (UNIX)
|
||||
find_library(X11_X11_xcb_LIB X11-xcb ${X11_LIB_SEARCH_PATH})
|
||||
find_library(X11_xcb_cursor_LIB xcb-cursor ${X11_LIB_SEARCH_PATH})
|
||||
find_library(X11_xcb_icccm_LIB xcb-icccm ${X11_LIB_SEARCH_PATH})
|
||||
find_library(X11_xcb_keysyms_LIB xcb-keysyms ${X11_LIB_SEARCH_PATH})
|
||||
find_library(X11_xcb_randr_LIB xcb-randr ${X11_LIB_SEARCH_PATH})
|
||||
find_library(X11_xcb_shape_LIB xcb-shape ${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})
|
||||
find_library(X11_xcb_xrm_LIB xcb-xrm ${X11_LIB_SEARCH_PATH})
|
||||
find_library(X11_xcb_xtest_LIB xcb-xtest ${X11_LIB_SEARCH_PATH})
|
||||
find_library(X11_xcb_keysyms_LIB xcb-keysyms ${X11_LIB_SEARCH_PATH})
|
||||
find_library(X11_xcb_xkb_LIB xcb-xkb ${X11_LIB_SEARCH_PATH})
|
||||
find_library(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH})
|
||||
find_library(X11_Xcursor_LIB Xcursor ${X11_LIB_SEARCH_PATH})
|
||||
find_library(X11_Xdamage_LIB Xdamage ${X11_LIB_SEARCH_PATH})
|
||||
@@ -309,6 +309,10 @@ if (UNIX)
|
||||
set(X11_xcb_icccm_FOUND TRUE)
|
||||
endif ()
|
||||
|
||||
if (X11_xcb_keysyms_LIB)
|
||||
set(X11_xcb_keysyms_FOUND TRUE)
|
||||
endif ()
|
||||
|
||||
if (X11_xcb_randr_LIB AND X11_xcb_randr_INCLUDE_PATH)
|
||||
set(X11_xcb_randr_FOUND TRUE)
|
||||
endif ()
|
||||
@@ -325,6 +329,10 @@ if (UNIX)
|
||||
set(X11_xcb_xfixes_FOUND TRUE)
|
||||
endif ()
|
||||
|
||||
if (X11_xcb_xkb_LIB)
|
||||
set(X11_xcb_xkb_FOUND TRUE)
|
||||
endif ()
|
||||
|
||||
if (X11_xcb_xrm_LIB AND X11_xcb_xrm_INCLUDE_PATH)
|
||||
set(X11_xcb_xrm_FOUND TRUE)
|
||||
endif ()
|
||||
@@ -333,14 +341,6 @@ if (UNIX)
|
||||
set(X11_xcb_xtest_FOUND TRUE)
|
||||
endif ()
|
||||
|
||||
if (X11_xcb_keysyms_LIB)
|
||||
set(X11_xcb_keysyms_FOUND TRUE)
|
||||
endif ()
|
||||
|
||||
if (X11_xcb_xkb_LIB)
|
||||
set(X11_xcb_xkb_FOUND TRUE)
|
||||
endif ()
|
||||
|
||||
if (X11_Xdmcp_INCLUDE_PATH AND X11_Xdmcp_LIB)
|
||||
set(X11_Xdmcp_FOUND TRUE)
|
||||
list(APPEND X11_INCLUDE_DIR ${X11_Xdmcp_INCLUDE_PATH})
|
||||
@@ -655,6 +655,13 @@ if (UNIX)
|
||||
INTERFACE_LINK_LIBRARIES "X11::xcb")
|
||||
endif ()
|
||||
|
||||
if (X11_xcb_keysyms_FOUND AND NOT TARGET X11::xcb_keysyms)
|
||||
add_library(X11::xcb_keysyms UNKNOWN IMPORTED)
|
||||
set_target_properties(X11::xcb_keysyms PROPERTIES
|
||||
IMPORTED_LOCATION "${X11_xcb_keysyms_LIB}"
|
||||
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
|
||||
@@ -683,6 +690,13 @@ if (UNIX)
|
||||
INTERFACE_LINK_LIBRARIES "X11::xcb")
|
||||
endif ()
|
||||
|
||||
if (X11_xcb_xkb_FOUND AND NOT TARGET X11::xcb_xkb)
|
||||
add_library(X11::xcb_xkb UNKNOWN IMPORTED)
|
||||
set_target_properties(X11::xcb_xkb PROPERTIES
|
||||
IMPORTED_LOCATION "${X11_xcb_xkb_LIB}"
|
||||
INTERFACE_LINK_LIBRARIES "X11::xcb")
|
||||
endif ()
|
||||
|
||||
if (X11_xcb_xrm_FOUND AND NOT TARGET X11::xcb_xrm)
|
||||
add_library(X11::xcb_xrm UNKNOWN IMPORTED)
|
||||
set_target_properties(X11::xcb_xrm PROPERTIES
|
||||
@@ -697,20 +711,6 @@ if (UNIX)
|
||||
INTERFACE_LINK_LIBRARIES "X11::xcb")
|
||||
endif ()
|
||||
|
||||
if (X11_xcb_keysyms_FOUND AND NOT TARGET X11::xcb_keysyms)
|
||||
add_library(X11::xcb_keysyms UNKNOWN IMPORTED)
|
||||
set_target_properties(X11::xcb_keysyms PROPERTIES
|
||||
IMPORTED_LOCATION "${X11_xcb_keysyms_LIB}"
|
||||
INTERFACE_LINK_LIBRARIES "X11::xcb")
|
||||
endif ()
|
||||
|
||||
if (X11_xcb_xkb_FOUND AND NOT TARGET X11::xcb_xkb)
|
||||
add_library(X11::xcb_xkb UNKNOWN IMPORTED)
|
||||
set_target_properties(X11::xcb_xkb PROPERTIES
|
||||
IMPORTED_LOCATION "${X11_xcb_xkb_LIB}"
|
||||
INTERFACE_LINK_LIBRARIES "X11::xcb")
|
||||
endif ()
|
||||
|
||||
if (X11_Xcomposite_FOUND AND NOT TARGET X11::Xcomposite)
|
||||
add_library(X11::Xcomposite UNKNOWN IMPORTED)
|
||||
set_target_properties(X11::Xcomposite PROPERTIES
|
||||
@@ -922,6 +922,8 @@ if (UNIX)
|
||||
X11_xcb_cursor_INCLUDE_PATH
|
||||
X11_xcb_icccm_LIB
|
||||
X11_xcb_icccm_INCLUDE_PATH
|
||||
X11_xcb_keysyms_LIB
|
||||
X11_xcb_keysyms_INCLUDE_PATH
|
||||
X11_xcb_randr_LIB
|
||||
X11_xcb_randr_INCLUDE_PATH
|
||||
X11_xcb_shape_LIB
|
||||
@@ -930,14 +932,12 @@ if (UNIX)
|
||||
X11_xcb_util_INCLUDE_PATH
|
||||
X11_xcb_xfixes_LIB
|
||||
X11_xcb_xfixes_INCLUDE_PATH
|
||||
X11_xcb_xkb_LIB
|
||||
X11_X11_xcb_LIB
|
||||
X11_xcb_xrm_LIB
|
||||
X11_xcb_xrm_INCLUDE_PATH
|
||||
X11_xcb_xtest_LIB
|
||||
X11_xcb_xtest_INCLUDE_PATH
|
||||
X11_xcb_keysyms_LIB
|
||||
X11_xcb_keysyms_INCLUDE_PATH
|
||||
X11_xcb_xkb_LIB
|
||||
X11_X11_xcb_LIB
|
||||
X11_X11_xcb_INCLUDE_PATH
|
||||
X11_Xlib_INCLUDE_PATH
|
||||
X11_Xutil_INCLUDE_PATH
|
||||
|
||||
Reference in New Issue
Block a user