From 0ef52d7f7ceee670e8961e811364d215fde7e980 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Wed, 9 Nov 2016 16:54:31 +0200 Subject: [build] Added EGL & GLX CI builds --- platform/linux/config.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'platform/linux') diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index d2f3d3aa94..94830e6d26 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -1,5 +1,5 @@ mason_use(glfw VERSION 3.2.1) -if(IS_CI_BUILD) +if(IS_CI_BUILD AND NOT WITH_EGL) mason_use(mesa VERSION 13.0.0${MASON_MESA_SUFFIX}${MASON_CXXABI_SUFFIX}) endif() mason_use(boost_libprogram_options VERSION 1.60.0) @@ -40,6 +40,7 @@ macro(mbgl_platform_core) ) if (IS_CI_BUILD) target_add_mason_package(mbgl-core PUBLIC mesa) + target_link_libraries(mbgl-core PUBLIC -lX11) else() target_link_libraries(mbgl-core PUBLIC -lGL -- cgit v1.2.1