49 lines
2.7 KiB
Plaintext
49 lines
2.7 KiB
Plaintext
$OpenBSD: patch-Modules_FindX11_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
|
|
--- Modules/FindX11.cmake.orig Tue Apr 6 16:45:32 2010
|
|
+++ Modules/FindX11.cmake Wed May 26 08:20:48 2010
|
|
@@ -22,6 +22,7 @@
|
|
# X11_xf86vmode_INCLUDE_PATH, X11_xf86vmode_FOUND
|
|
# X11_Xfixes_INCLUDE_PATH, X11_Xfixes_LIB, X11_Xfixes_FOUND
|
|
# X11_Xft_INCLUDE_PATH, X11_Xft_LIB, X11_Xft_FOUND
|
|
+# X11_Xi_INCLUDE_PATH, X11_Xi_LIB, X11_Xi_FOUND
|
|
# X11_Xinerama_INCLUDE_PATH, X11_Xinerama_LIB, X11_Xinerama_FOUND
|
|
# X11_Xinput_INCLUDE_PATH, X11_Xinput_LIB, X11_Xinput_FOUND
|
|
# X11_Xkb_INCLUDE_PATH, X11_Xkb_FOUND
|
|
@@ -91,6 +92,7 @@ IF (UNIX)
|
|
FIND_PATH(X11_xf86vmode_INCLUDE_PATH X11/extensions/xf86vmode.h ${X11_INC_SEARCH_PATH})
|
|
FIND_PATH(X11_Xfixes_INCLUDE_PATH X11/extensions/Xfixes.h ${X11_INC_SEARCH_PATH})
|
|
FIND_PATH(X11_Xft_INCLUDE_PATH X11/Xft/Xft.h ${X11_INC_SEARCH_PATH})
|
|
+ FIND_PATH(X11_Xi_INCLUDE_PATH X11/extensions/XInput.h ${X11_INC_SEARCH_PATH})
|
|
FIND_PATH(X11_Xinerama_INCLUDE_PATH X11/extensions/Xinerama.h ${X11_INC_SEARCH_PATH})
|
|
FIND_PATH(X11_Xinput_INCLUDE_PATH X11/extensions/XInput.h ${X11_INC_SEARCH_PATH})
|
|
FIND_PATH(X11_Xkb_INCLUDE_PATH X11/extensions/XKB.h ${X11_INC_SEARCH_PATH})
|
|
@@ -120,6 +122,7 @@ IF (UNIX)
|
|
FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH})
|
|
FIND_LIBRARY(X11_Xfixes_LIB Xfixes ${X11_LIB_SEARCH_PATH})
|
|
FIND_LIBRARY(X11_Xft_LIB Xft ${X11_LIB_SEARCH_PATH})
|
|
+ FIND_LIBRARY(X11_Xi_LIB Xi ${X11_LIB_SEARCH_PATH})
|
|
FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH})
|
|
FIND_LIBRARY(X11_Xinput_LIB Xi ${X11_LIB_SEARCH_PATH})
|
|
FIND_LIBRARY(X11_Xpm_LIB Xpm ${X11_LIB_SEARCH_PATH})
|
|
@@ -219,6 +222,11 @@ IF (UNIX)
|
|
SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_XTest_INCLUDE_PATH})
|
|
ENDIF (X11_XTest_INCLUDE_PATH AND X11_XTest_LIB)
|
|
|
|
+ IF (X11_Xi_INCLUDE_PATH AND X11_Xi_LIB)
|
|
+ SET(X11_Xi_FOUND TRUE)
|
|
+ SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xi_INCLUDE_PATH})
|
|
+ ENDIF (X11_Xi_INCLUDE_PATH AND X11_Xi_LIB)
|
|
+
|
|
IF (X11_Xinerama_INCLUDE_PATH AND X11_Xinerama_LIB)
|
|
SET(X11_Xinerama_FOUND TRUE)
|
|
SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xinerama_INCLUDE_PATH})
|
|
@@ -396,6 +404,8 @@ IF (UNIX)
|
|
X11_Xxf86misc_LIB
|
|
X11_xf86misc_INCLUDE_PATH
|
|
X11_xf86vmode_INCLUDE_PATH
|
|
+ X11_Xi_LIB
|
|
+ X11_Xi_INCLUDE_PATH
|
|
X11_Xinerama_LIB
|
|
X11_Xinerama_INCLUDE_PATH
|
|
X11_XTest_LIB
|