diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-08-29 11:39:55 +0300 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-08-31 14:56:38 +0100 |
| commit | faf699ae95ee265c76ced49a75578654ad3052e0 (patch) | |
| tree | 157b58eae251e8547fb584ab2929e6e1e25728e2 | |
| parent | f5622dbe555c974e972741b1f08adf7023f5fd3b (diff) | |
cmake: Link utils with xcb explicitly
Linking CXX executables with gold linker leads to:
libpiglitutil_gl.so.0: error: undefined reference to 'xcb_connect'
libpiglitutil_gl.so.0: error: undefined reference to 'xcb_get_setup'
libpiglitutil_gl.so.0: error: undefined reference to 'xcb_setup_roots_iterator'
This may have appeared now because xcb-dri2 used to overlink publicly
but now does not.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/util/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9275743d9..536f77583 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -155,6 +155,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") pkg_check_modules(LIBDRM QUIET libdrm) pkg_check_modules(LIBDRM_INTEL QUIET libdrm_intel) + pkg_check_modules(XCB QUIET xcb) pkg_check_modules(XCB_DRI2 QUIET xcb-dri2) pkg_check_modules(GLPROTO QUIET glproto) ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Windows") diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt index fb22ffa9a..e1f8073b3 100644 --- a/tests/util/CMakeLists.txt +++ b/tests/util/CMakeLists.txt @@ -121,11 +121,13 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") list(APPEND UTIL_GL_LIBS ${LIBDRM_LDFLAGS} + ${XCB_LDFLAGS} ${XCB_DRI2_LDFLAGS} ) list(APPEND UTIL_GL_INCLUDES ${LIBDRM_INCLUDE_DIRS} + ${XCB_INCLUDE_DIRS} ${XCB_DRI2_INCLUDE_DIRS} ) |