diff options
| author | FslNopper <Norbert.Nopper@freescale.com> | 2015-12-01 13:17:34 +0100 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-12-04 16:17:45 -0700 |
| commit | 9aff95b974086687f541c20952ea17e95148ba2d (patch) | |
| tree | 242825dd6c67002563423ed2871b2a3e7c4f19b4 | |
| parent | d980924199ccacc18c47a62c1ca029dc161b8999 (diff) | |
| download | usermoji-9aff95b974086687f541c20952ea17e95148ba2d.tar.xz | |
Fixes, that build is possible with Xlib configuration.
| -rwxr-xr-x | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | cmake/FindX11_XCB.cmake | 32 |
2 files changed, 33 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9510e31d..59bfd6bf 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,7 @@ if(WIN32) add_definitions(-DVK_USE_PLATFORM_WIN32_KHR -DWIN32_LEAN_AND_MEAN) else() add_definitions(-DVK_USE_PLATFORM_XCB_KHR) + add_definitions(-DVK_USE_PLATFORM_XLIB_KHR) endif() set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake") diff --git a/cmake/FindX11_XCB.cmake b/cmake/FindX11_XCB.cmake new file mode 100644 index 00000000..956bf89d --- /dev/null +++ b/cmake/FindX11_XCB.cmake @@ -0,0 +1,32 @@ +# - Try to find libX11-xcb +# Once done this will define +# +# X11_XCB_FOUND - system has libX11-xcb +# X11_XCB_LIBRARIES - Link these to use libX11-xcb +# X11_XCB_INCLUDE_DIR - the libX11-xcb include dir +# X11_XCB_DEFINITIONS - compiler switches required for using libX11-xcb + +# Copyright (c) 2011 Fredrik Höglund <fredrik@kde.org> +# Copyright (c) 2008 Helio Chissini de Castro, <helio@kde.org> +# Copyright (c) 2007 Matthias Kretz, <kretz@kde.org> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +IF (NOT WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + FIND_PACKAGE(PkgConfig) + PKG_CHECK_MODULES(PKG_X11_XCB QUIET x11-xcb) + + SET(X11_XCB_DEFINITIONS ${PKG_X11_XCB_CFLAGS}) + + FIND_PATH(X11_XCB_INCLUDE_DIR NAMES X11/Xlib-xcb.h HINTS ${PKG_X11_XCB_INCLUDE_DIRS}) + FIND_LIBRARY(X11_XCB_LIBRARIES NAMES X11-xcb HINTS ${PKG_X11_XCB_LIBRARY_DIRS}) + + include(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(X11_XCB DEFAULT_MSG X11_XCB_LIBRARIES X11_XCB_INCLUDE_DIR) + + MARK_AS_ADVANCED(X11_XCB_INCLUDE_DIR X11_XCB_LIBRARIES) +ENDIF (NOT WIN32) + |