Changed include path for X11 and extensions.
X11 and X11/extensions should not be part of X11 include path if X11/xxx.h or X11/extensions/xxx.h is used in source files.
This commit is contained in:
parent
3725a032ef
commit
1de5fbfbbf
@ -28,7 +28,7 @@
|
||||
# limitations under the License.
|
||||
#=============================================================================
|
||||
|
||||
find_path(X11_INCLUDE_DIR NAMES Xlib.h
|
||||
find_path(X11_INCLUDE_DIR NAMES X11/Xlib.h
|
||||
PATH_SUFFIXES X11
|
||||
DOC "The X11 include directory"
|
||||
)
|
||||
|
@ -28,7 +28,7 @@
|
||||
# limitations under the License.
|
||||
#=============================================================================
|
||||
|
||||
find_path(XKBFILE_INCLUDE_DIR NAMES XKBfile.h
|
||||
find_path(XKBFILE_INCLUDE_DIR NAMES X11/extensions/XKBfile.h
|
||||
PATH_SUFFIXES X11/extensions
|
||||
DOC "The XKBFile include directory"
|
||||
)
|
||||
|
@ -28,7 +28,7 @@
|
||||
# limitations under the License.
|
||||
#=============================================================================
|
||||
|
||||
find_path(XSHM_INCLUDE_DIR NAMES XShm.h
|
||||
find_path(XSHM_INCLUDE_DIR NAMES X11/extensions/XShm.h
|
||||
PATH_SUFFIXES X11/extensions
|
||||
DOC "The XShm include directory"
|
||||
)
|
||||
|
@ -28,7 +28,7 @@
|
||||
# limitations under the License.
|
||||
#=============================================================================
|
||||
|
||||
find_path(XTEST_INCLUDE_DIR NAMES XTest.h
|
||||
find_path(XTEST_INCLUDE_DIR NAMES X11/extensions/XTest.h
|
||||
PATH_SUFFIXES X11/extensions
|
||||
DOC "The XTest include directory"
|
||||
)
|
||||
|
@ -28,7 +28,7 @@
|
||||
# limitations under the License.
|
||||
#=============================================================================
|
||||
|
||||
find_path(XCURSOR_INCLUDE_DIR NAMES Xcursor.h
|
||||
find_path(XCURSOR_INCLUDE_DIR NAMES X11/Xcursor/Xcursor.h
|
||||
PATH_SUFFIXES X11/Xcursor
|
||||
DOC "The Xcursor include directory"
|
||||
)
|
||||
|
@ -28,7 +28,7 @@
|
||||
# limitations under the License.
|
||||
#=============================================================================
|
||||
|
||||
find_path(XDAMAGE_INCLUDE_DIR NAMES Xdamage.h
|
||||
find_path(XDAMAGE_INCLUDE_DIR NAMES X11/extensions/Xdamage.h
|
||||
PATH_SUFFIXES X11/extensions
|
||||
DOC "The Xdamage include directory"
|
||||
)
|
||||
|
@ -28,7 +28,7 @@
|
||||
# limitations under the License.
|
||||
#=============================================================================
|
||||
|
||||
find_path(XEXT_INCLUDE_DIR NAMES Xext.h
|
||||
find_path(XEXT_INCLUDE_DIR NAMES X11/extensions/Xext.h
|
||||
PATH_SUFFIXES X11/extensions
|
||||
DOC "The Xext include directory"
|
||||
)
|
||||
|
@ -28,7 +28,7 @@
|
||||
# limitations under the License.
|
||||
#=============================================================================
|
||||
|
||||
find_path(XFIXES_INCLUDE_DIR NAMES Xfixes.h
|
||||
find_path(XFIXES_INCLUDE_DIR NAMES X11/extensions/Xfixes.h
|
||||
PATH_SUFFIXES X11/extensions
|
||||
DOC "The Xfixes include directory"
|
||||
)
|
||||
|
@ -28,7 +28,7 @@
|
||||
# limitations under the License.
|
||||
#=============================================================================
|
||||
|
||||
find_path(XINERAMA_INCLUDE_DIR NAMES Xinerama.h
|
||||
find_path(XINERAMA_INCLUDE_DIR NAMES X11/extensions/Xinerama.h
|
||||
PATH_SUFFIXES X11/extensions
|
||||
DOC "The Xinerama include directory"
|
||||
)
|
||||
|
@ -28,7 +28,7 @@
|
||||
# limitations under the License.
|
||||
#=============================================================================
|
||||
|
||||
find_path(XV_INCLUDE_DIR NAMES Xv.h
|
||||
find_path(XV_INCLUDE_DIR NAMES X11/extensions/Xv.h
|
||||
PATH_SUFFIXES X11/extensions
|
||||
DOC "The Xv include directory"
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user