kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Fixed ordering of X11 search.

This commit is contained in:
Brad King 2003-01-02 09:57:42 -05:00
parent e7fd8fb12f
commit 204308132f
1 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Modules/FindX11.cmake
View File

@ -9,49 +9,28 @@
IF (UNIX) IF (UNIX)
SET(CMAKE_HAS_X 0) SET(CMAKE_HAS_X 0)
FIND_PATH(CMAKE_X11_INCLUDE_PATH X11/X.h SET(CMAKE_X11_INC_SEARCH_PATH
/usr/include /usr/X11R6/include
/usr/local/include /usr/local/include
/usr/include/X11
/usr/openwin/include /usr/openwin/include
/usr/openwin/share/include /usr/openwin/share/include
/usr/X11R6/include
/usr/include/X11
/opt/graphics/OpenGL/include /opt/graphics/OpenGL/include
)
FIND_PATH(CMAKE_Xlib_INCLUDE_PATH X11/Xlib.h
/usr/include /usr/include
/usr/local/include
/usr/openwin/include
/usr/openwin/share/include
/usr/X11R6/include
/usr/include/X11
/opt/graphics/OpenGL/include
) )
FIND_PATH(CMAKE_Xutil_INCLUDE_PATH X11/Xutil.h SET(CMAKE_X11_LIB_SEARCH_PATH
/usr/include /usr/X11R6/lib
/usr/local/include
/usr/openwin/include
/usr/openwin/share/include
/usr/X11R6/include
/usr/include/X11
/opt/graphics/OpenGL/include
)
FIND_LIBRARY(CMAKE_X11_LIB X11
/usr/lib
/usr/local/lib /usr/local/lib
/usr/openwin/lib /usr/openwin/lib
/usr/X11R6/lib /usr/lib
) )
FIND_LIBRARY(CMAKE_Xext_LIB Xext FIND_PATH(CMAKE_X11_INCLUDE_PATH X11/X.h ${CMAKE_X11_INC_SEARCH_PATH})
/usr/lib FIND_PATH(CMAKE_Xlib_INCLUDE_PATH X11/Xlib.h ${CMAKE_X11_INC_SEARCH_PATH})
/usr/local/lib FIND_PATH(CMAKE_Xutil_INCLUDE_PATH X11/Xutil.h ${CMAKE_X11_INC_SEARCH_PATH})
/usr/openwin/lib FIND_LIBRARY(CMAKE_X11_LIB X11 ${CMAKE_X11_LIB_SEARCH_PATH})
/usr/X11R6/lib FIND_LIBRARY(CMAKE_Xext_LIB Xext ${CMAKE_X11_LIB_SEARCH_PATH})
)
IF(CMAKE_X11_INCLUDE_PATH) IF(CMAKE_X11_INCLUDE_PATH)
SET(CMAKE_X_INCLUDE_DIRS ${CMAKE_X_INCLUDE_DIRS} ${CMAKE_X11_INCLUDE_PATH}) SET(CMAKE_X_INCLUDE_DIRS ${CMAKE_X_INCLUDE_DIRS} ${CMAKE_X11_INCLUDE_PATH})