encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmake: allow cmake re-configuration after installation of x11 library 

check_include_path is not meant to be used to check for presence of a
library. This is because a BOOL is cached.
Avoid this caching by using find_file.
`find_file` caches a patch instead of a bool and will always run when
the result failed.
This commit is contained in:
Anonymous Maarten 2022-07-21 18:38:12 +02:00
parent 192ae1e356
commit e5698d1394
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cmake/sdlchecks.cmake
View File

@ -422,7 +422,10 @@ macro(CheckX11)
FindLibraryAndSONAME("${_LIB}") FindLibraryAndSONAME("${_LIB}")
endforeach() endforeach()
find_path(X_INCLUDEDIR X11/Xlib.h set(X11_dirs)
find_path(X_INCLUDEDIR
NAMES X11/Xlib.h
PATHS
/usr/pkg/xorg/include /usr/pkg/xorg/include
/usr/X11R6/include /usr/X11R6/include
/usr/X11R7/include /usr/X11R7/include
@ -436,18 +439,17 @@ macro(CheckX11)
if(X_INCLUDEDIR) if(X_INCLUDEDIR)
list(APPEND EXTRA_CFLAGS "-I${X_INCLUDEDIR}") list(APPEND EXTRA_CFLAGS "-I${X_INCLUDEDIR}")
list(APPEND CMAKE_REQUIRED_INCLUDES "${X_INCLUDEDIR}")
endif() endif()
check_include_file(X11/Xcursor/Xcursor.h HAVE_XCURSOR_H) find_file(HAVE_XCURSOR_H NAMES "X11/Xcursor/Xcursor.h" HINTS "${X_INCLUDEDIR}")
check_include_file(X11/extensions/XInput2.h HAVE_XINPUT2_H) find_file(HAVE_XINPUT2_H NAMES "X11/extensions/XInput2.h" HINTS "${X_INCLUDEDIR}")
check_include_file(X11/extensions/Xrandr.h HAVE_XRANDR_H) find_file(HAVE_XRANDR_H NAMES "X11/extensions/Xrandr.h" HINTS "${X_INCLUDEDIR}")
check_include_file(X11/extensions/Xfixes.h HAVE_XFIXES_H_) find_file(HAVE_XFIXES_H_ NAMES "X11/extensions/Xfixes.h" HINTS "${X_INCLUDEDIR}")
check_include_file(X11/extensions/Xrender.h HAVE_XRENDER_H) find_file(HAVE_XRENDER_H NAMES "X11/extensions/Xrender.h" HINTS "${X_INCLUDEDIR}")
check_include_file(X11/extensions/scrnsaver.h HAVE_XSS_H) find_file(HAVE_XSS_H NAMES "X11/extensions/scrnsaver.h" HINTS "${X_INCLUDEDIR}")
check_include_file(X11/extensions/shape.h HAVE_XSHAPE_H) find_file(HAVE_XSHAPE_H NAMES "X11/extensions/shape.h" HINTS "${X_INCLUDEDIR}")
check_include_files("X11/Xlib.h;X11/extensions/Xdbe.h" HAVE_XDBE_H) find_file(HAVE_XDBE_H NAMES "X11/extensions/Xdbe.h" HINTS "${X_INCLUDEDIR}")
check_include_files("X11/Xlib.h;X11/Xproto.h;X11/extensions/Xext.h" HAVE_XEXT_H) find_file(HAVE_XEXT_H NAMES "X11/extensions/Xext.h" HINTS "${X_INCLUDEDIR}")
if(X11_LIB) if(X11_LIB)
if(NOT HAVE_XEXT_H) if(NOT HAVE_XEXT_H)